Commit Graph

36519 Commits

Author SHA1 Message Date
Brian Carlstrom
e0cd5dc3dc Revert "Add keychain user with special keystore access permissions"
This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb.

Conflicts:

	cmds/keystore/keystore.c

Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563
2011-06-30 22:59:13 -07:00
Dan Morrill
5affe048ba Merge "Add a global-search column for last access." 2011-06-30 22:37:45 -07:00
Hung-ying Tyan
082b29d1c2 Merge "Synchronize SipWakeupTimer.onReceive()" 2011-06-30 20:28:58 -07:00
Adam Powell
f6a62dc323 Merge "Add API to report the presence of a permanent menu key on the device." 2011-06-30 20:23:52 -07:00
Jeff Hamilton
60c64e2730 Merge "Improve Tag.toString()." 2011-06-30 18:38:35 -07:00
Pannag Sanketi
19e0a8bfe9 Merge "Minor fix in SurfaceTexture" 2011-06-30 18:38:18 -07:00
Kazuhiro Ondo
e0b3a8bb38 am 0562efd1: am f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit '0562efd1ea970ded01b1b47bbce790a269a60c45':
  Make sure to update data availability in call setup capable triggers.
2011-06-30 18:23:42 -07:00
Robert Greenwalt
d6430eb97d am 8745caaf: am dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit '8745caaf25e9f2d50125a793b7d02fc4522ba4ba':
  Fix dependencyMet issues regarding hipri APN.
2011-06-30 18:23:34 -07:00
Svetoslav Ganov
0593b91291 Merge "Crash observed when attempted to uncheck the Accessibility option." 2011-06-30 18:07:11 -07:00
Brian Carlstrom
269f4182ae Merge "Add body id to ssl_certificate layout" 2011-06-30 18:06:12 -07:00
Kazuhiro Ondo
d15f60005d am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
2011-06-30 18:00:06 -07:00
Svetoslav Ganov
b9a2ce7626 Merge "Fix crash at boot." 2011-06-30 17:18:47 -07:00
Andreas Huber
091ab30729 Merge "Seeking/duration in HLS content is based on the individual segments' duration" 2011-06-30 16:58:41 -07:00
Mathias Agopian
5cd338365f Merge "fix screen on/off animation, which was flipped" 2011-06-30 16:25:25 -07:00
Mathias Agopian
2dbf9fffb2 fix screen on/off animation, which was flipped
Bug: 4673549
Change-Id: Ia9766754687b89c1ee24b2dbe918c11290ebe038
2011-06-30 16:23:39 -07:00
Jim Miller
ea030363d3 Merge "Fix 4691563: Polish MultiWaveView experience in LockScreen and InCall screen Better activation experience: - Hold off on switching out targets until current animation has finished. - Hide unselected targets when a target is selected. Code simplification: - Use explicit callback objects to handle animation updates instead of having MWV implement the interface. - More compact chevron-loading code. - Don't use animations for properties that need to change immediately." 2011-06-30 15:56:47 -07:00
Pannag Sanketi
292a31a4c2 Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
2011-06-30 15:41:19 -07:00
Robert Greenwalt
65e55863d5 am a2267451: Don\'t ever report a null ServiceState
* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState
2011-06-30 14:50:32 -07:00
Svetoslav Ganov
eaf33439b6 Merge "Updating accessibility documentation." 2011-06-30 14:19:02 -07:00
Adam Powell
4d97e260de Merge "Fix some issues with the action bar and action modes." 2011-06-30 14:06:33 -07:00
Dianne Hackborn
a6d2c2dbb7 Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents" 2011-06-30 13:57:27 -07:00
Shimeng (Simon) Wang
5e5d232ecb Merge "Keep initial zoom overview for non-standard load." 2011-06-30 13:55:10 -07:00
RoboErik
1f40d19013 Merge "API updates to respond to comments" 2011-06-30 13:30:15 -07:00
Fabrice Di Meglio
d0174f2869 Merge "Support control of text alignment." 2011-06-30 13:11:50 -07:00
Jeff Hamilton
d617b99572 Merge "Add a string based createUri()." 2011-06-30 13:08:44 -07:00
Jeff Brown
74f0601c32 Merge "Synthetic cancel event should have touchscreen source." 2011-06-30 12:52:13 -07:00
Chia-chi Yeh
65c944ec95 Merge "VPN: refactor few JNI methods for the usage of legacy VPN." 2011-06-30 12:43:14 -07:00
Shimeng (Simon) Wang
cfcd92b015 Merge "Use default scale when restored scale is 0." 2011-06-30 11:23:12 -07:00
Andreas Huber
5fa46f025e Merge "Revert "Parse RTP-Info even for live streams."" 2011-06-30 11:21:14 -07:00
Irfan Sheriff
07b8ae0070 Merge "DnsPinger changes incl. binding" 2011-06-30 08:51:01 -07:00
Conley Owens
0f39173b3d am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '98395483e4309f7b92348136491575861008b3c0':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
2011-06-30 08:25:13 -07:00
Conley Owens
5040be6ab3 am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
2011-06-30 08:22:10 -07:00
Conley Owens
fdf196c3e4 am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit 'e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
2011-06-30 08:19:00 -07:00
Conley Owens
efa5bc7e87 Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 2011-06-30 08:11:25 -07:00
Justin Ho
6045867b31 Merge "Textfield assets from Gingerbread for compatibility" 2011-06-30 07:56:53 -07:00
Justin Ho
713c8451b8 Merge "Initial upscaled progress spinners from Gingerbread in xhdpi" 2011-06-30 07:56:43 -07:00
Justin Ho
1d6f27841d Merge "Updated popup assets in xhdpi. Padding issues will be resolved in a separate CL." 2011-06-30 07:56:24 -07:00
Hung-ying Tyan
f529ff4c45 Merge "Make NAT port timeout measurement more flexible." 2011-06-30 03:04:58 -07:00
Jeff Sharkey
cf1c74e1fa Merge "Permissions to protect bandwidth statistics." 2011-06-30 00:49:12 -07:00
Chih-Chung Chang
f3a31e9362 Merge "Remove curtain effect (it's unused)." 2011-06-30 00:13:13 -07:00
Jeff Brown
c89a40a79f Merge "Fix joystick and trackpad regression." 2011-06-29 21:20:36 -07:00
Brian Carlstrom
2f3c9e9746 Merge "KeyChain API for credential installation" 2011-06-29 18:49:39 -07:00
Shimeng (Simon) Wang
b49ebed96c Merge "Initial zoom overview flag only meaningful in page overview mode." 2011-06-29 18:04:56 -07:00
Daniel Sandler
7c86df2c22 Merge "Add 2mm dead zone (12dp) at the top of the navigation bar." 2011-06-29 17:45:25 -07:00
Kazuhiro Ondo
6fd281700b am f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
  Make sure to update data availability in call setup capable triggers.
2011-06-29 17:24:56 -07:00
Romain Guy
d9dcb70dd8 Merge "Add test case for driver issue" 2011-06-29 17:22:18 -07:00
Russell Brenner
2a2a19908a Merge "Add Hebrew bold and regular font files" 2011-06-29 16:16:42 -07:00
Mathias Agopian
e6786c92d7 Merge "SF transactions are now O(1) wrt IPC instead of O(N)." 2011-06-29 16:15:56 -07:00
Chia-chi Yeh
ac7c11cf0a Merge "VPN: add a method to handle requests of legacy VPNs." 2011-06-29 16:08:26 -07:00
Teng-Hui Zhu
3a6e7c725d Merge "Media player should be paused while the surface is still alive" 2011-06-29 15:58:38 -07:00