OSDN Git Service
Tim Murray [Sat, 11 May 2013 00:06:52 +0000 (17:06 -0700)]
am
17502c4b: Merge "Remove extraneous logging." into jb-mr2-dev
* commit '
17502c4bc0d021cb9bf6ac195a2e7c26afcc549e':
Remove extraneous logging.
Tim Murray [Sat, 11 May 2013 00:05:02 +0000 (00:05 +0000)]
Merge "Remove extraneous logging." into jb-mr2-dev
Jeff Brown [Fri, 10 May 2013 23:13:44 +0000 (16:13 -0700)]
am
9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev
* commit '
9766caedf0657615f739d4e441ab9f2fa71aa709':
Add an API to determine if a route is connecting.
Jeff Brown [Fri, 10 May 2013 23:10:32 +0000 (23:10 +0000)]
Merge "Add an API to determine if a route is connecting." into jb-mr2-dev
Robert Greenwalt [Fri, 10 May 2013 22:57:06 +0000 (15:57 -0700)]
am
6f8fb959: Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"
* commit '
6f8fb9594fa5387340601c8b6e3e13f51e57f54b':
Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Dmitry Shmidt [Fri, 10 May 2013 22:57:02 +0000 (15:57 -0700)]
am
00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events"
* commit '
00ee47ead451ee2584c23f15a3760ae041e82e56':
framework/base: Handle ASSOC-REJECT events
Robert Greenwalt [Fri, 10 May 2013 22:41:10 +0000 (22:41 +0000)]
Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"
John Spurlock [Fri, 10 May 2013 22:39:04 +0000 (15:39 -0700)]
am
11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev
* commit '
11184922d30f468bf97a2e20a3aeff7e1ae7ca54':
Fix battery level quick settings tile bug.
John Spurlock [Fri, 10 May 2013 22:36:17 +0000 (22:36 +0000)]
Merge "Fix battery level quick settings tile bug." into jb-mr2-dev
Dmitry Shmidt [Fri, 10 May 2013 22:35:23 +0000 (22:35 +0000)]
Merge "framework/base: Handle ASSOC-REJECT events"
Robert Greenwalt [Fri, 10 May 2013 22:26:30 +0000 (15:26 -0700)]
am
408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
* commit '
408ad99dd307ae93abec76821d343b8e080c99c9':
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Conley Owens [Fri, 10 May 2013 22:26:26 +0000 (15:26 -0700)]
am
d702e48c: Merge "Expose AutoCloseable."
* commit '
d702e48c1394e4e0fc4db8ffc83e4b9ef6e6a40d':
Expose AutoCloseable.
Robert Greenwalt [Fri, 10 May 2013 22:15:27 +0000 (22:15 +0000)]
Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
Conley Owens [Fri, 10 May 2013 22:11:46 +0000 (22:11 +0000)]
Merge "Expose AutoCloseable."
Christopher Tate [Fri, 10 May 2013 22:08:27 +0000 (15:08 -0700)]
am
1965b447: Revert "The default home intent needs CATEGORY_DEFAULT"
* commit '
1965b4479d07750756ccf845134df6ddd5ce4103':
Revert "The default home intent needs CATEGORY_DEFAULT"
Christopher Tate [Fri, 10 May 2013 22:00:45 +0000 (15:00 -0700)]
Revert "The default home intent needs CATEGORY_DEFAULT"
This reverts commit
1fea6b374f612ca8cedc17de873526f0f7c42a4e.
Bug
8895796
Change-Id: I80ecf1b718829c25e2a7adae956ebe9493cb3f33
Elliott Hughes [Fri, 10 May 2013 21:21:30 +0000 (14:21 -0700)]
Expose AutoCloseable.
Bug:
3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
Craig Mautner [Fri, 10 May 2013 20:34:23 +0000 (13:34 -0700)]
am
4754f401: Merge "Avoid NullPointerException in getHandler()"
* commit '
4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
Avoid NullPointerException in getHandler()
Svetoslav [Fri, 10 May 2013 20:10:41 +0000 (13:10 -0700)]
am
b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
* commit '
b3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80':
Accessibility should not query for list items when data set changed.
Svetoslav [Fri, 10 May 2013 20:06:42 +0000 (20:06 +0000)]
Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
John Spurlock [Fri, 10 May 2013 16:46:44 +0000 (12:46 -0400)]
Fix battery level quick settings tile bug.
Bug:
8726138
Change-Id: I068a78f99ab30ffe24e620be7744cf7835142f56
Craig Mautner [Fri, 10 May 2013 19:50:39 +0000 (19:50 +0000)]
Merge "Avoid NullPointerException in getHandler()"
Chris Craik [Fri, 10 May 2013 19:44:26 +0000 (12:44 -0700)]
am
4329ee25: Merge "Fix off by one error in log tracking" into jb-mr2-dev
* commit '
4329ee25659c27b1cd90f95f127192964346e471':
Fix off by one error in log tracking
Marco Nelissen [Fri, 10 May 2013 19:44:12 +0000 (12:44 -0700)]
Marco Nelissen [Fri, 10 May 2013 19:44:09 +0000 (12:44 -0700)]
am
aad3762f: Merge "Fix build" into jb-mr2-dev
* commit '
aad3762f1bcc3e90c6f312669caa1115f4714669':
Fix build
Marco Nelissen [Fri, 10 May 2013 19:44:05 +0000 (12:44 -0700)]
am
86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
* commit '
86e0b491d1b50e59221420de3005184b1dee8373':
Add VideoView.getAudioSessionId()
Chris Craik [Fri, 10 May 2013 18:03:57 +0000 (18:03 +0000)]
Merge "Fix off by one error in log tracking" into jb-mr2-dev
Marco Nelissen [Fri, 10 May 2013 15:28:36 +0000 (08:28 -0700)]
Fix build
Change-Id: I2eb54a936630094b4bd9c19a944579670a4e0bb8
Marco Nelissen [Fri, 10 May 2013 15:16:27 +0000 (15:16 +0000)]
Merge "Fix build" into jb-mr2-dev
Marco Nelissen [Fri, 10 May 2013 15:05:15 +0000 (08:05 -0700)]
Fix build
Change-Id: I4afe65f73d8607a97a561615ebfc34aadfe00b95
Partha N [Tue, 7 May 2013 03:20:47 +0000 (20:20 -0700)]
Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.
Replaced TABs with spaces.
Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
Marco Nelissen [Fri, 10 May 2013 14:12:13 +0000 (14:12 +0000)]
Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
Elliott Hughes [Fri, 10 May 2013 06:40:54 +0000 (23:40 -0700)]
am
92393d85: Merge "Update nomenclature." into jb-mr2-dev
* commit '
92393d8518604eab9a1edfbcf8f0329ffeee46e7':
Update nomenclature.
Dirk Dougherty [Fri, 10 May 2013 06:40:44 +0000 (23:40 -0700)]
am
cf30f631: am
3f14b556: am
cf90471a: am
f1456dea: am
a48a2d16: am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
cf30f631cf0aa9108b2d495ea43e102608cfa91e':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 06:40:41 +0000 (23:40 -0700)]
am
77d7e0a3: am
3676cbb6: am
054215d1: am
d948cb49: am
8f820209: am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
77d7e0a36234b8981c25232d6c35b4fd64d1c083':
update homepage with IO Live banner
Jim Miller [Fri, 10 May 2013 06:40:30 +0000 (23:40 -0700)]
am
00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev
* commit '
0055383554983842c5d7bab25a981c6eb804a38c':
Attempt to fix NPE in keyguard
Dianne Hackborn [Fri, 10 May 2013 06:40:28 +0000 (23:40 -0700)]
am
83d6df27: Merge "Help on issue #
8863955: Google Services keeping phone awake..." into jb-mr2-dev
* commit '
83d6df27d40aed18a7dc42c9320f83656cc81ea0':
Help on issue #
8863955: Google Services keeping phone awake...
Elliott Hughes [Fri, 10 May 2013 05:30:26 +0000 (05:30 +0000)]
Merge "Update nomenclature." into jb-mr2-dev
Jeff Brown [Fri, 10 May 2013 04:56:42 +0000 (21:56 -0700)]
Add an API to determine if a route is connecting.
Bug:
8175766
Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
Dirk Dougherty [Fri, 10 May 2013 01:04:05 +0000 (18:04 -0700)]
am
3f14b556: am
cf90471a: am
f1456dea: am
a48a2d16: am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
3f14b556a30f4ae8026f05dadfa54c4d68ff926b':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 01:04:00 +0000 (18:04 -0700)]
am
3676cbb6: am
054215d1: am
d948cb49: am
8f820209: am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
3676cbb61a4c59957c2a8cb3a257ff2ce0a02597':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 01:02:19 +0000 (18:02 -0700)]
am
cf90471a: am
f1456dea: am
a48a2d16: am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
cf90471aff7b43a8c0ebc32298b20d31d4e767a3':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 01:02:16 +0000 (18:02 -0700)]
am
054215d1: am
d948cb49: am
8f820209: am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
054215d1a9d5e0f814388c235124f776fd3f42b6':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 00:59:50 +0000 (17:59 -0700)]
am
f1456dea: am
a48a2d16: am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
f1456deaa85a999d2c10bc92642613c97782fd98':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 00:59:47 +0000 (17:59 -0700)]
am
d948cb49: am
8f820209: am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
d948cb496fb8e0941046457cd3321a0fbcadcbff':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 00:56:27 +0000 (17:56 -0700)]
am
a48a2d16: am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
a48a2d16ef042466048eaff25542ea903711bff0':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 00:56:24 +0000 (17:56 -0700)]
am
8f820209: am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
8f8202095e8f4cd167b499ca19ebccda63f04c0c':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 00:53:37 +0000 (17:53 -0700)]
am
4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
* commit '
4da9c11b2758d55c67f7a24c3eb519c36497ba5d':
Doc change: refresh gms/gcm reference docs.
Scott Main [Fri, 10 May 2013 00:53:34 +0000 (17:53 -0700)]
am
4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '
4e3773d3f626595c703d26dea1f354c37ad76bde':
update homepage with IO Live banner
Dirk Dougherty [Fri, 10 May 2013 00:37:51 +0000 (00:37 +0000)]
Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs
Dirk Dougherty [Thu, 9 May 2013 22:04:08 +0000 (15:04 -0700)]
Doc change: refresh gms/gcm reference docs.
Change-Id: Ife17b6b3dfb387bc7de6c827c0e6db19a756534f
Jim Miller [Fri, 10 May 2013 00:03:56 +0000 (00:03 +0000)]
Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev
Chris Craik [Thu, 9 May 2013 20:07:52 +0000 (13:07 -0700)]
Fix off by one error in log tracking
bug:
8875715
Additionally moves op logging before the op is executed, to print
correctly, in pre-order traversal
Change-Id: I4e9566261f8363c73739d183e6d82b854f72ffad
Dianne Hackborn [Thu, 9 May 2013 23:47:21 +0000 (23:47 +0000)]
Merge "Help on issue #
8863955: Google Services keeping phone awake..." into jb-mr2-dev
Scott Main [Thu, 9 May 2013 23:30:09 +0000 (23:30 +0000)]
Merge "update homepage with IO Live banner" into jb-mr1.1-docs
Jeff Brown [Thu, 9 May 2013 23:23:43 +0000 (16:23 -0700)]
am
b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
* commit '
b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
Add an API to allow a callback to request active scans.
Jeff Brown [Thu, 9 May 2013 23:23:40 +0000 (16:23 -0700)]
am
2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev
* commit '
2298d68e72afa9cf311af394b61f92f75385bbbf':
Fix bug managing wifi display routes.
Jim Miller [Thu, 9 May 2013 21:43:16 +0000 (14:43 -0700)]
Attempt to fix NPE in keyguard
This attempts to fix a bug where it looks like we have null content in
one of the widget pages in keyguard.
Based on the bug description, it's likely the transport control was just
removed from the view hierarchy. Not sure how the content can be null
in this case, but this will hopefully prevent the crash and give us some
insight into what caused it.
Fixes bug
8886916
Change-Id: I22c26c49f22fa5b06987e8199070a9aaead2ff8a
Amith Yamasani [Thu, 9 May 2013 23:23:31 +0000 (16:23 -0700)]
am
153919ed: Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev
* commit '
153919ed2f128fb5d1b55782ea89fadcc20fc841':
Cache the scaled avatar drawables in the keyguard user switcher
Chet Haase [Thu, 9 May 2013 23:23:29 +0000 (16:23 -0700)]
am
fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev
* commit '
fb32c82412111983236f44cbc8fd90f113d7ea34':
Fix start delay jank in ViewPropertyAnimator
Matthew Xie [Thu, 9 May 2013 23:23:26 +0000 (16:23 -0700)]
am
b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev
* commit '
b566c466c73d351d01e64d1c9ba609133efc4ffd':
Donot bind to GATT service when BLE is not supported
Jeff Brown [Thu, 9 May 2013 23:04:26 +0000 (23:04 +0000)]
Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
Jeff Brown [Thu, 9 May 2013 23:03:57 +0000 (23:03 +0000)]
Merge "Fix bug managing wifi display routes." into jb-mr2-dev
Marco Nelissen [Thu, 9 May 2013 22:36:53 +0000 (15:36 -0700)]
Add VideoView.getAudioSessionId()
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/
8767565
Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
Dianne Hackborn [Thu, 9 May 2013 22:27:47 +0000 (15:27 -0700)]
Help on issue #
8863955: Google Services keeping phone awake...
...because of Google Play Services
Raise the limit on the number of wake locks we track per uid.
Get rid of the separate limit for the system process, since it
now isn't any larger than the new limit for regular processes.
Change-Id: Ic10c81cad7d4ad4aabf1f53f78191a0973a1d784
Amith Yamasani [Thu, 9 May 2013 22:17:51 +0000 (22:17 +0000)]
Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev
Chet Haase [Thu, 9 May 2013 22:09:18 +0000 (22:09 +0000)]
Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev
Tim Murray [Thu, 9 May 2013 19:02:50 +0000 (12:02 -0700)]
Remove extraneous logging.
bug
8888887
Change-Id: I68d01c2ba649257be1577d53f330ad28d3b57011
Amith Yamasani [Wed, 8 May 2013 23:43:58 +0000 (16:43 -0700)]
Cache the scaled avatar drawables in the keyguard user switcher
Loading the avatar icons and drawing them into the sized bitmap
turns out to be quite expensive and the cost increases with number
of users. Caching them shaves off several hundred milliseconds from
Keyguard inflation time during user switching on the lockscreen.
For instance, 15ms vs. 750ms with 3 avatars on a certain 7" tablet.
Bug:
7986933
Change-Id: I3e2065bfa25aa263133ba204ca364c3b04d7c0ff
Jeff Brown [Thu, 9 May 2013 20:40:39 +0000 (13:40 -0700)]
Add an API to allow a callback to request active scans.
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.
Bug:
8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
Chet Haase [Thu, 9 May 2013 21:40:21 +0000 (14:40 -0700)]
Fix start delay jank in ViewPropertyAnimator
Issue #
8892620 start delay jank in ViewPropertyAnimator
Change-Id: I17a57ac3351fb2c1516b594d135aa9ce9f78c88e
Matthew Xie [Thu, 9 May 2013 21:14:47 +0000 (21:14 +0000)]
Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev
Jeff Brown [Thu, 9 May 2013 20:41:11 +0000 (13:41 -0700)]
Fix bug managing wifi display routes.
We could sometimes crash due to some inconsistencies in the
way the wifi display routes were updates when connecting,
disconnecting or scanning wifi displays.
Bug:
8837094
Change-Id: I10c7ccb163ec33c4ea107dfcb5074741049fe955
Daniel Sandler [Thu, 9 May 2013 18:30:58 +0000 (11:30 -0700)]
am
ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev
* commit '
ffe3b5b89fa58f7b12a2fc690c89480fc16a9fd6':
Exempt the notification panel from animation lockout.
Daniel Sandler [Thu, 9 May 2013 18:28:42 +0000 (18:28 +0000)]
Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev
Derek Sollenberger [Thu, 9 May 2013 18:26:29 +0000 (11:26 -0700)]
am
bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev
* commit '
bee78812d0b3fc3d877ed0d954a0bb21ab7f2f3b':
Fix bug where we incorrectly clipped the bounds to the device size.
Derek Sollenberger [Thu, 9 May 2013 18:23:56 +0000 (18:23 +0000)]
Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev
Raph Levien [Thu, 9 May 2013 18:07:33 +0000 (11:07 -0700)]
am
dde8e539: Merge "Fix bug
8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev
* commit '
dde8e539c3d76c98360e4cd1151cb15cba78a6b0':
Fix bug
8717690 Full-width Latin Letters Garbled on Tumblr App
Raph Levien [Thu, 9 May 2013 18:04:39 +0000 (18:04 +0000)]
Merge "Fix bug
8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev
Derek Sollenberger [Thu, 9 May 2013 13:49:41 +0000 (09:49 -0400)]
Fix bug where we incorrectly clipped the bounds to the device size.
This CL also updates the documenation to make it clear that the API
returns in local space, not clipped to the size of the bitmap/device.
bug:
8747526
Change-Id: I389844672ce955341863f9940c3b401ab00dc1dc
Amith Yamasani [Thu, 9 May 2013 17:47:08 +0000 (10:47 -0700)]
am
73094fbc: Merge "Don\'t allow non-authorized apps to access auth tokens" into jb-mr2-dev
* commit '
73094fbc23a4f6142f790f63b66ae5b553fb6e55':
Don't allow non-authorized apps to access auth tokens
Amith Yamasani [Thu, 9 May 2013 17:43:16 +0000 (17:43 +0000)]
Merge "Don't allow non-authorized apps to access auth tokens" into jb-mr2-dev
Daniel Sandler [Thu, 9 May 2013 17:31:51 +0000 (10:31 -0700)]
am
60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev
* commit '
60ac308e1da302716fd6c5d805c513221039bac2':
Defend against a system server crash.
Daniel Sandler [Thu, 9 May 2013 17:29:04 +0000 (17:29 +0000)]
Merge "Defend against a system server crash." into jb-mr2-dev
Dianne Hackborn [Thu, 9 May 2013 17:23:08 +0000 (10:23 -0700)]
am
cb359697: Merge "DO NOT MERGE. Fix issue #
8868003: Recents thumbnails scale..." into jb-mr2-dev
* commit '
cb35969708e88057bda7c54c7b3ac1d606ad95c5':
DO NOT MERGE. Fix issue #
8868003: Recents thumbnails scale...
Dianne Hackborn [Thu, 9 May 2013 17:19:56 +0000 (17:19 +0000)]
Merge "DO NOT MERGE. Fix issue #
8868003: Recents thumbnails scale..." into jb-mr2-dev
Derek Sollenberger [Thu, 9 May 2013 12:02:52 +0000 (05:02 -0700)]
am
2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev
* commit '
2c76016cbc1e426ab30d322745dfb6d4e6784138':
Fix error where clips/matrices are incorrectly transferred.
Derek Sollenberger [Thu, 9 May 2013 11:59:47 +0000 (11:59 +0000)]
Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev
Deepthi Gowri [Tue, 30 Apr 2013 12:53:57 +0000 (18:23 +0530)]
framework/base: Handle ASSOC-REJECT events
Disable current network and enable other saved networks(if any)
once number of ASSOC-REJECTs on an attempt to connect to a corresponding
network exceeds the threshold.
Change-Id: Iac3c1596aa800d93c55b0ac5d8070a058c3842bd
Matthew Xie [Thu, 9 May 2013 02:26:57 +0000 (19:26 -0700)]
Donot bind to GATT service when BLE is not supported
bug
8664724
Change-Id: I9b9222cd5877babcded73798a5d1ff13fd10e791
Dianne Hackborn [Wed, 8 May 2013 22:51:26 +0000 (15:51 -0700)]
DO NOT MERGE. Fix issue #
8868003: Recents thumbnails scale...
...+ zoom to wrong place
We need to make sure the overscan insets are never negative.
Change-Id: I6ca82acc2a6c887085a5d14d03a55ea78451e4b6
Daniel Sandler [Thu, 9 May 2013 00:30:43 +0000 (17:30 -0700)]
am
5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
* commit '
5d6dc425287e5651e3a1fdc32591b8791dd9dd18':
Filter out dangerous CharSequences in Notification.
Daniel Sandler [Thu, 9 May 2013 00:28:11 +0000 (00:28 +0000)]
Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
Deepthi Gowri [Wed, 6 Mar 2013 10:52:46 +0000 (16:22 +0530)]
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Fix for P2P GO beaconing when 4-way Handshake fails by setting
p2p_group_idle timeout of 10 sec when group is started as a GO
and clear it when AP_STA_CONNECTED event is received.
Change-Id: I40189efc31eeb55e01a95a2a8e9c1a95d929952d
bug:
8871100
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
Christopher Tate [Wed, 8 May 2013 23:13:20 +0000 (16:13 -0700)]
am
cfb09fac: Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev
* commit '
cfb09fac73716291468b61f20ee1b7818d1dcfd1':
The default home intent needs CATEGORY_DEFAULT
Christopher Tate [Wed, 8 May 2013 23:09:49 +0000 (23:09 +0000)]
Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev
Xia Wang [Wed, 8 May 2013 22:21:12 +0000 (15:21 -0700)]
am
4550dba5: Merge "Add wifi association test" into jb-mr2-dev
* commit '
4550dba53d49a689de6000e5e5864c28f91dd945':
Add wifi association test
Xia Wang [Wed, 8 May 2013 22:17:35 +0000 (22:17 +0000)]
Merge "Add wifi association test" into jb-mr2-dev
Svetoslav [Wed, 8 May 2013 21:37:03 +0000 (14:37 -0700)]
am
0dd85e4e: Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev
* commit '
0dd85e4e99466709049ba913241612b6678732ca':
Dynamically togglable accessibility features improperly handled.
Svetoslav [Wed, 8 May 2013 21:33:43 +0000 (21:33 +0000)]
Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev
OSDN Git Service
