GitLab

Change-Id: I26cdb3e72a0075e4df3854b526bdf6bb08d671a2

Merge commit '77880ae4'

* commit '77880ae4':
  SipService: add permission check for using API

Merge commit 'b77455ee'

* commit 'b77455ee':
  Implement tracking of package install times.

am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.

Merge commit '779a6e41'

* commit '779a6e41':
  Do not merge.

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

Merge commit '0689b60b'

* commit '0689b60b':
  Symlink application lib directory when on SD card

Merge commit 'ea445758'

* commit 'ea445758':
  Unhide SIP API.

Merge commit '647ff645'

* commit '647ff645':
  Use explicit intent for installing credentials.

Change-Id: I3489b6909ce2a215318d45f809b82579503fd733

Change-Id: Ibb4cce6b33e6cf4b164a8f594c21727891bc6ff0
Signed-off-by: Mike Lockwood <lockwood@google.com>

Change-Id: I94fda1db4ef358d21f63ad057b088d68133ab4b4

Some users of the download API (eg system update) need to get the
actual local filename of a downloaded file, not just a content URI.

Change-Id: I877e2776e778c1712f654ba5c840bfe6ed3fe60f

- Register buffers with Gralloc when unflattening a GraphicBuffer (rather than
doing it in the Surface class).
- Add support for a GraphicBuffer that wraps an android_native_window_t*.

Change-Id: I029ac086111bbac800e5ca37eb505f558b718cd8

am f5cae7d1: (-s ours) am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread

Merge commit 'f5cae7d1'

* commit 'f5cae7d1':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.

am 6c4609ad: (-s ours) am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit '6c4609ad'

* commit '6c4609ad':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.

Merge commit '4b7ff734'

* commit '4b7ff734':
  Suppress harder for echo without affecting the volume of real voice.

am f10929fb: am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread

Merge commit 'f10929fb'

* commit 'f10929fb':
  Minor fix for InputReader support for non-touchscreen devices.

am 4f2c8cc8: (-s ours) am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit '4f2c8cc8'

* commit '4f2c8cc8':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.

am d185494d: (-s ours) am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread

Merge commit 'd185494d'

* commit 'd185494d':
  Port mock ril controller and tests to GB. DO NOT MERGE

Merge commit 'c6faec80'

* commit 'c6faec80':
  Removing 'last' of red cross asset.

am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

Merge commit '22cb4ef8'

* commit '22cb4ef8':
  Switch Looper back to using poll() instead of epoll().

Merge commit '9580b8ce'

* commit '9580b8ce':
  Update of DRM framework.

am bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

Merge commit 'bb708373'

* commit 'bb708373':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.

Merge commit '51501aa8'

* commit '51501aa8':
  Fixed popup assets (background)

am b3616395: am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread

Merge commit 'b3616395'

* commit 'b3616395':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.

Merge commit '6a15f0d7'

* commit '6a15f0d7':
  Quiet unnecessary debug logging.

am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread

Merge commit '45bd1159'

* commit '45bd1159':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.

Merge commit 'c0c2076e'

* commit 'c0c2076e':
  Eliminate MCS_GIVE_UP state

Merge commit '5e3329b5'

* commit '5e3329b5':
  Removed unused and broken screen_progress

Merge commit 'b8d40d26'

* commit 'b8d40d26':
  More DropBoxManager javadoc love.

Merge commit '992a9e50'

* commit '992a9e50':
  DropBox.Entry javadoc syntax fix

Merge commit 'c296f22e'

* commit 'c296f22e':
  Revert "Only allow 8 OBBs to be mounted by a UID"

Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2

am 82aacdde: (-s ours) am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread

Merge commit '82aacdde'

* commit '82aacdde':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests

am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread

Merge commit '2e99245e'

* commit '2e99245e':
  Changed handling of onQueryCompelete to not use mimeType.

Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d