Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'
* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
Fix a JNI layer crash due to null camera object passed to get_native_camera()
* changes:
Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'
* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
Fix 1840639 to support overlays with zz_ZZ.
* changes:
Fix 1840639 to support overlays with zz_ZZ. Everything but strings worked fine before but a new default string would generate a build error.
Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'
* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
GPS: Generalize SUPL support to include AGPS for CDMA
* changes:
Fix#1807059. If it is "POST", always use BasicHttpEntityEnclosingRequest even bodyProvider is null. This ensures the content-type, content-encoding and content-length are set correctly.
Merge commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472'
* commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472':
Modify camera framework to use new streamlined binder interface.
* changes:
Modify camera framework to use new streamlined binder interface. This is the second half of bug 1837832. Modifies the camera client and camera service to use the new binder interface. Removes the old binder interface. There will be one more part to this change to surface the undefined callbacks to the Java layer so that partners can implement new features without having to touch the stack.
Merge commit '82e61c947b909bcb373aca491fe1248f23764eaf'
* commit '82e61c947b909bcb373aca491fe1248f23764eaf':
Make in-app search have a different background resource which looks
* changes:
Make in-app search have a different background resource which looks like a slide-out drawer, to provide app context and because it is not full-screen.
This is the second half of bug 1837832. Modifies the camera client
and camera service to use the new binder interface. Removes the
old binder interface. There will be one more part to this change
to surface the undefined callbacks to the Java layer so that
partners can implement new features without having to touch the
stack.
Merge commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c'
* commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c':
AI 148665: Disabling a test that does not work as
Merge commit '25f963753ea762c12c74c0dcb861b023ac92177a' into donut
* commit '25f963753ea762c12c74c0dcb861b023ac92177a':
AI 148665: Disabling a test that does not work as
Merge commit '851a54143c15a1c33361efae2db3f7f45059b472'
* commit '851a54143c15a1c33361efae2db3f7f45059b472':
Implement targetSdkVersion and maxSdkVersion, plus version code names.
Merge commit '7b59fe316e23e05ef33648a855c2280dd8fad981'
* commit '7b59fe316e23e05ef33648a855c2280dd8fad981':
Make the internal storage monitor work correctly when internal storage is very large.
Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'
* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
fix the sim build. disables the tests for now.
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'
* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
Define the URI path, columns and constants for shortcut validation.
Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'
* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
Add new binder methods to camera client to support generic callbacks
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'
* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
* update density correctly when the configuration is changed.
