OSDN Git Service
The Android Open Source Project [Wed, 22 Aug 2012 22:37:23 +0000 (15:37 -0700)]
am
1ac4ba19: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1ac4ba19778d3aafc84ad240e38657807e2a7aad':
Fix NPE.
Make animators more robust against ending mid-stream
The Android Open Source Project [Wed, 22 Aug 2012 22:35:18 +0000 (15:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic44b998aee206c0a43d1da8cbf35e961745cb6f3
Ying Wang [Wed, 22 Aug 2012 22:27:43 +0000 (15:27 -0700)]
am
510aa89c: am
9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev
* commit '
510aa89ca32d120f60fd8186b9575dc74b57aada':
Remove obsolete variables.
Ying Wang [Wed, 22 Aug 2012 22:23:10 +0000 (15:23 -0700)]
am
9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev
* commit '
9f814ac5fc0df77527d69710e8c1efa9d9d6f495':
Remove obsolete variables.
Ying Wang [Wed, 22 Aug 2012 22:19:44 +0000 (15:19 -0700)]
Merge "Remove obsolete variables." into jb-mr1-dev
Chet Haase [Wed, 22 Aug 2012 22:11:22 +0000 (15:11 -0700)]
am
2a100873: am
5f9e92f4: Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
* commit '
2a100873adb5500122887a0f30331788830eca1b':
Fix animation of notification handle bar when panel changes height
Chet Haase [Wed, 22 Aug 2012 22:09:19 +0000 (15:09 -0700)]
am
5f9e92f4: Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
* commit '
5f9e92f46fe06689a3018929590ef5f79688f0bc':
Fix animation of notification handle bar when panel changes height
Chet Haase [Wed, 22 Aug 2012 22:06:56 +0000 (15:06 -0700)]
Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:12:48 +0000 (13:12 -0700)]
Fix NPE.
Bug:
7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
James Dong [Wed, 22 Aug 2012 21:55:54 +0000 (14:55 -0700)]
am
309f099b: am
d78fc5b9: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '
309f099bda05dc213f1c0545fe5e21c2b37be815':
Let getOriginalMimeType() take a fd passed from drm java applications
James Dong [Wed, 22 Aug 2012 21:53:46 +0000 (14:53 -0700)]
am
d78fc5b9: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '
d78fc5b94d1bb3dab509ca55d09052821c51412b':
Let getOriginalMimeType() take a fd passed from drm java applications
James Dong [Wed, 22 Aug 2012 21:50:27 +0000 (14:50 -0700)]
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Craig Mautner [Wed, 22 Aug 2012 21:19:55 +0000 (14:19 -0700)]
am
c91e00c8: am
b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
* commit '
c91e00c8b4a223a022289b675cee4b3316122786':
Eliminate special battery calls by WindowManager
Craig Mautner [Wed, 22 Aug 2012 21:17:38 +0000 (14:17 -0700)]
am
b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
* commit '
b9b56954ec5a242f7c4945942539106539f98ffb':
Eliminate special battery calls by WindowManager
Craig Mautner [Wed, 22 Aug 2012 21:14:54 +0000 (14:14 -0700)]
Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
James Dong [Thu, 9 Aug 2012 00:45:59 +0000 (17:45 -0700)]
Let getOriginalMimeType() take a fd passed from drm java applications
At present, we did not actually pass the fd. This patch allows us to
make the changes necessary in the future without worrying too much
about broken build.
related-to-bug:
6426185
Change-Id: I125decff9be621a72f2631fd439994a94a526606
Jeff Brown [Wed, 22 Aug 2012 20:35:10 +0000 (13:35 -0700)]
am
de053978: am
6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
* commit '
de0539781533c46c10b00d2f068766fcdd284394':
Fix auto-brightness adjustment sentinel value.
Jeff Brown [Wed, 22 Aug 2012 20:32:46 +0000 (13:32 -0700)]
am
6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
* commit '
6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560':
Fix auto-brightness adjustment sentinel value.
Jeff Brown [Wed, 22 Aug 2012 20:31:08 +0000 (13:31 -0700)]
Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:22:02 +0000 (13:22 -0700)]
Fix auto-brightness adjustment sentinel value.
Change-Id: I1b0da4566eb350333d3c3b09a96266627260baa3
Jeff Brown [Wed, 22 Aug 2012 20:21:13 +0000 (13:21 -0700)]
am
408471a2: am
6da92032: Merge "Fix NPE." into jb-mr1-dev
* commit '
408471a28b7adce10d8235cb38ed861cbfe51fb7':
Fix NPE.
Jeff Brown [Wed, 22 Aug 2012 20:19:46 +0000 (13:19 -0700)]
am
6da92032: Merge "Fix NPE." into jb-mr1-dev
* commit '
6da92032da255920d2e584f6ba2f8f9336ec9310':
Fix NPE.
Jeff Brown [Wed, 22 Aug 2012 20:17:22 +0000 (13:17 -0700)]
Merge "Fix NPE." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:12:48 +0000 (13:12 -0700)]
Fix NPE.
Bug:
7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
Irfan Sheriff [Wed, 22 Aug 2012 18:07:22 +0000 (11:07 -0700)]
am
a63d11de: am
dfe55787: am
c584a24b: am
2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '
a63d11de448984b82f5076f89b938fe2a1d00cad':
Avoid system_server crashing due to mac address is null
Irfan Sheriff [Wed, 22 Aug 2012 18:04:53 +0000 (11:04 -0700)]
am
dfe55787: am
c584a24b: am
2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '
dfe5578771080bf225225d3c903e186d92f5b274':
Avoid system_server crashing due to mac address is null
Irfan Sheriff [Wed, 22 Aug 2012 18:03:13 +0000 (11:03 -0700)]
am
c584a24b: am
2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '
c584a24ba1af0c831adf46fe57b69af396fb925c':
Avoid system_server crashing due to mac address is null
Craig Mautner [Wed, 22 Aug 2012 02:30:58 +0000 (19:30 -0700)]
Eliminate special battery calls by WindowManager
Previous to this change the WindowManager was notifying the
BatteryDtatsService about windows that keep the screen on. WM used a
custom WakeLock tag to indicate to PowerManagerService that it had
already notified the BatteryStatsService.
This change eliminates WindowManager notifying the BatteryStatsService
and lets PowerManagerService do the job.
Fixes bug
7030326.
Change-Id: I666dc6ef8f094b8d3d109fea6876be058e057b4f
Irfan Sheriff [Wed, 22 Aug 2012 18:01:03 +0000 (11:01 -0700)]
am
2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '
2140d1de47579db839b6a4ccc87394e80449d7a6':
Avoid system_server crashing due to mac address is null
Irfan Sheriff [Wed, 22 Aug 2012 17:48:23 +0000 (10:48 -0700)]
Merge "Avoid system_server crashing due to mac address is null"
Amith Yamasani [Wed, 22 Aug 2012 17:35:15 +0000 (10:35 -0700)]
am
5ee6095e: am
98dddda7: Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
* commit '
5ee6095e25e314317196fd72ca405847e849f6b3':
Remove permission requirement for some UserManager calls
Amith Yamasani [Wed, 22 Aug 2012 17:33:50 +0000 (10:33 -0700)]
am
98dddda7: Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
* commit '
98dddda7912428241ed61c053c7300d4a6702fa7':
Remove permission requirement for some UserManager calls
Amith Yamasani [Wed, 22 Aug 2012 17:31:30 +0000 (10:31 -0700)]
Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
Amith Yamasani [Tue, 21 Aug 2012 22:40:12 +0000 (15:40 -0700)]
Remove permission requirement for some UserManager calls
Update javadocs to be explicit about permissions.
Minor fixes in UserManagerService
Change-Id: I0d355e0a60e5dbdb49ed06091111d480ff249f3d
Selim Gurun [Wed, 22 Aug 2012 16:10:17 +0000 (09:10 -0700)]
am
d9dad604: am
6479ecd1: Merge "Fix onFindResultReceived API" into jb-mr1-dev
* commit '
d9dad6043c4b239907a47bf97409049e8ba014b0':
Fix onFindResultReceived API
Selim Gurun [Wed, 22 Aug 2012 16:08:41 +0000 (09:08 -0700)]
am
6479ecd1: Merge "Fix onFindResultReceived API" into jb-mr1-dev
* commit '
6479ecd1b24e9d5a5636130cb4b0c353b396ff0e':
Fix onFindResultReceived API
Selim Gurun [Wed, 22 Aug 2012 16:06:04 +0000 (09:06 -0700)]
Merge "Fix onFindResultReceived API" into jb-mr1-dev
Kenny Root [Wed, 22 Aug 2012 15:59:20 +0000 (08:59 -0700)]
am
9865132f: am
9b90ee2d: Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev
* commit '
9865132fd961610fbd53974d1590285b99cb6512':
Add KeyPairGenerator for Android keystore
Kenny Root [Wed, 22 Aug 2012 15:57:50 +0000 (08:57 -0700)]
am
9b90ee2d: Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev
* commit '
9b90ee2d0bb6fb9147d3fad3a1c60326fd6f0fd4':
Add KeyPairGenerator for Android keystore
Kenny Root [Wed, 22 Aug 2012 15:55:26 +0000 (08:55 -0700)]
Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 17:48:46 +0000 (10:48 -0700)]
Add KeyPairGenerator for Android keystore
This allows end-users to generate keys in the keystore without the
private part of the key ever needing to leave the device. The generation
process also generates a self-signed certificate.
Change-Id: I114ffb8e0cbe3b1edaae7e69e8aa578cb835efc9
Chet Haase [Wed, 22 Aug 2012 14:14:42 +0000 (07:14 -0700)]
Fix animation of notification handle bar when panel changes height
The notification panel uses LayoutTransition to animate changes to
the list of notifications. This works for the items themselves as
items are added or removed; the new/old items animate in/out and the
existing items animate to make or remove space.
But the handle at the bottom of the list (the gray translucent line) does
not play well with these changes. For example, when an item is swiped away
the handle snaps into its new location before the rest of the items have
finished animating.
The problem comes from a constraint of LayoutTransition; it handles changes
to the container it operates on, and to the parent hierarchy all the way up
to the root. However, it cannot animate changes to siblings of the parents.
So when the list resizes due to item changes, the handle (which is in a sibling
of the list) does not animate this change, but just reacts instantly.
The fix is to draw the handle not as a view itself, but rather as part of the
parent container of the list. So as the list animates a resize, the container will
also animate, and any graphics in the container will animate along with it.
No matter what size the container of the list is, the line will be drawn at
the bottom of it.
Issue #
7024902 Notification panel animation incorrect when swiping notification out
Change-Id: Ifc412cb6bcdc6ead35993b0320364a2a95a16e11
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:52:19 +0000 (07:52 -0700)]
am
50c323ba: am
2bd65b61: am
29c6f24b: am
6ffe2594: Merge "restorecon /data/anr directory."
* commit '
50c323bad2bb238f2d437efd8f5aa70515be8e2e':
restorecon /data/anr directory.
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:50:41 +0000 (07:50 -0700)]
am
2bd65b61: am
29c6f24b: am
6ffe2594: Merge "restorecon /data/anr directory."
* commit '
2bd65b61ba6e98496dc574251e06709546d24500':
restorecon /data/anr directory.
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:49:03 +0000 (07:49 -0700)]
am
29c6f24b: am
6ffe2594: Merge "restorecon /data/anr directory."
* commit '
29c6f24b254b4ea1a7d8448980e736355e4badf6':
restorecon /data/anr directory.
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:46:41 +0000 (07:46 -0700)]
am
6ffe2594: Merge "restorecon /data/anr directory."
* commit '
6ffe2594674f250c16c5e3055aa69680efaa6f69':
restorecon /data/anr directory.
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:18:39 +0000 (07:18 -0700)]
Merge "restorecon /data/anr directory."
The Android Automerger [Wed, 22 Aug 2012 13:33:45 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 07:16:45 +0000 (00:16 -0700)]
am
b8ce29e4: am
00a8f4ff: Make the electron beam animation shorter.
* commit '
b8ce29e4b353bd5c83cf7b45dc5d9d577e4c4169':
Make the electron beam animation shorter.
Jeff Brown [Wed, 22 Aug 2012 07:14:42 +0000 (00:14 -0700)]
am
00a8f4ff: Make the electron beam animation shorter.
* commit '
00a8f4ff627584f4d9a8ae0cd83f87786005e16d':
Make the electron beam animation shorter.
Jeff Brown [Wed, 22 Aug 2012 07:12:56 +0000 (00:12 -0700)]
am
7453b1d0: am
aa202a6d: Add a mechanism to adjust auto-brightness at night.
* commit '
7453b1d0a02524e3ef38db8cdb4c4da084b139b4':
Add a mechanism to adjust auto-brightness at night.
Jeff Brown [Wed, 22 Aug 2012 07:11:15 +0000 (00:11 -0700)]
am
8f1584af: am
2416e096: Extract the twilight detection into its own service.
* commit '
8f1584aff3b442263008f5b972721214691c64f1':
Extract the twilight detection into its own service.
Jeff Brown [Wed, 22 Aug 2012 07:10:52 +0000 (00:10 -0700)]
am
aa202a6d: Add a mechanism to adjust auto-brightness at night.
* commit '
aa202a6dc33d331cbd9e34a1bb5f74db6284dda6':
Add a mechanism to adjust auto-brightness at night.
Jeff Brown [Wed, 22 Aug 2012 07:09:12 +0000 (00:09 -0700)]
am
2416e096: Extract the twilight detection into its own service.
* commit '
2416e09649eb6ab767eba458796e126196c77a34':
Extract the twilight detection into its own service.
Jeff Brown [Wed, 22 Aug 2012 06:11:46 +0000 (23:11 -0700)]
Make the electron beam animation shorter.
Now using about the same duration as it used to have when
it was implemented in Surface Flinger.
Change-Id: I09b28222379f4b6583f1f7b34188cc36c50509e9
Jeff Brown [Wed, 22 Aug 2012 05:14:26 +0000 (22:14 -0700)]
Add a mechanism to adjust auto-brightness at night.
Uses the twilight service to determine the hours of
sunrise and sunset. Shortly after sunset or before sunrise
gradually start to apply a gamma correction factor to the
auto-brightness calculations to make the screen a little
dimmer at night.
The effect is relatively small and is mostly noticeable
in dark rooms. This is just a first pass at the algorithm,
we can tweak the adjustment later to ensure that it has even less
impact in moderate or bright environments.
Change-Id: Idf89022a5d0bb52975e04779352d53fa63371178
Jeff Brown [Wed, 22 Aug 2012 05:12:20 +0000 (22:12 -0700)]
Extract the twilight detection into its own service.
Moving the detection out of UiModeManagerService will
make it easy for other services to register for the
information.
Fixed a bugs related to updating twilight state
when the time is updated.
We're using the same algorithm as before for passively
tracking the location. Ideally we should update it
to use the new location manager features for low-power
location requests.
Change-Id: I520c53b9946ab6f8d994587d357fd6542c300c07
Jeff Brown [Wed, 22 Aug 2012 06:45:09 +0000 (23:45 -0700)]
am
fbb0ac66: am
ae25108a: Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
* commit '
fbb0ac66b6f1948b11b74033e1c783ecc78f7d56':
Add support for auto-brightness adjust, but leave it disabled.
Jeff Brown [Wed, 22 Aug 2012 06:43:25 +0000 (23:43 -0700)]
am
ae25108a: Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
* commit '
ae25108a7b7181bedac11d6b31ff0a64ece729aa':
Add support for auto-brightness adjust, but leave it disabled.
Jeff Brown [Wed, 22 Aug 2012 06:40:19 +0000 (23:40 -0700)]
Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 06:23:06 +0000 (23:23 -0700)]
am
7e68e923: am
11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev
* commit '
7e68e923058295b5b0b789f00cf66d0a289e2115':
Make the screen brightness setting limits configurable.
Jeff Brown [Wed, 22 Aug 2012 06:21:14 +0000 (23:21 -0700)]
am
11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev
* commit '
11167b887aa2af52b861f5ffd31efa0882c80ec5':
Make the screen brightness setting limits configurable.
Jeff Brown [Wed, 22 Aug 2012 06:20:22 +0000 (23:20 -0700)]
am
64ce3396: am
572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev
* commit '
64ce3396dba49e95a0fbf912890c91d3339b7b87':
Add FloatMath.pow.
Jeff Brown [Wed, 22 Aug 2012 06:19:08 +0000 (23:19 -0700)]
Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 06:18:33 +0000 (23:18 -0700)]
am
572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev
* commit '
572a0859dd258d2d72588bfd22b750a4322d3b23':
Add FloatMath.pow.
Jeff Brown [Wed, 22 Aug 2012 06:15:55 +0000 (23:15 -0700)]
Merge "Add FloatMath.pow." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 05:10:57 +0000 (22:10 -0700)]
Add support for auto-brightness adjust, but leave it disabled.
Auto-brightness adjustment applies a gamma correction factor
between 1/3 and 3 depending on the setting. This feature
is disabled for now.
Change-Id: I2b300b5c455da545bea56b2bae5bc7903e30f30e
Jeff Brown [Wed, 22 Aug 2012 05:04:02 +0000 (22:04 -0700)]
Make the screen brightness setting limits configurable.
Change-Id: Ica84951c482edef6b7faebe1af22c609a1b9e8be
Jeff Brown [Wed, 22 Aug 2012 02:49:48 +0000 (19:49 -0700)]
Add FloatMath.pow.
Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
Chih-Wei Huang [Wed, 22 Aug 2012 03:26:51 +0000 (11:26 +0800)]
Avoid system_server crashing due to mac address is null
It's possible that the mac address is null (getMacAddress() of WifiNative.java).
In this case system_server will crash like:
E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: WifiWatchdogStateMachine
E AndroidRuntime: java.lang.NullPointerException
E AndroidRuntime: at android.net.arp.ArpPeer.<init>(ArpPeer.java:57)
E AndroidRuntime: at android.net.wifi.WifiWatchdogStateMachine.doArpTest(WifiWatchdogStateMachine.java:866)
Check the mac address before parsing to avoid crashing.
Change-Id: I5d4205c04d479a3a2837172c6382816ea4bf74d6
Selim Gurun [Wed, 22 Aug 2012 00:32:35 +0000 (17:32 -0700)]
Fix onFindResultReceived API
This is to fix open source bug 36509, i.e.
http://code.google.com/p/android/issues/detail?id=36509
the parameters are swapped.
Change-Id: I6245d254943c7c97e847a241d0069d85118763f7
Ying Wang [Wed, 22 Aug 2012 00:23:00 +0000 (17:23 -0700)]
Remove obsolete variables.
Bug:
6987838
Now emma is only enabled for apks.
Change-Id: Id8d198467076a8dff705195a8e051f3fb00d5660
Jason Sams [Wed, 22 Aug 2012 00:16:30 +0000 (17:16 -0700)]
am
d9cde043: am
f9678070: Merge "Fix bug in grain." into jb-mr1-dev
* commit '
d9cde0435d2469ada77aa45465ade4cd92aa88fe':
Fix bug in grain.
Jason Sams [Wed, 22 Aug 2012 00:14:48 +0000 (17:14 -0700)]
am
6afc755b: am
a8309cb7: Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
* commit '
6afc755bf09b63727be1ffd36753e45b5c16b96a':
Move the kernel launch to specific intrinsic class.
Brian Muramatsu [Wed, 22 Aug 2012 00:14:45 +0000 (17:14 -0700)]
am
07d9f60b: am
43c7aae4: Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
* commit '
07d9f60b15e0d7e3678ed0a6429394b975eec2dc':
Listen for CONNECTIVITY_ACTION in GPS Provider
Jason Sams [Wed, 22 Aug 2012 00:13:06 +0000 (17:13 -0700)]
am
f9678070: Merge "Fix bug in grain." into jb-mr1-dev
* commit '
f9678070a03ad16d223d26a38b319d38d5943a71':
Fix bug in grain.
Jason Sams [Wed, 22 Aug 2012 00:11:24 +0000 (17:11 -0700)]
am
a8309cb7: Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
* commit '
a8309cb7ee05502176c2715f381ea5e63016daae':
Move the kernel launch to specific intrinsic class.
Brian Muramatsu [Wed, 22 Aug 2012 00:11:20 +0000 (17:11 -0700)]
am
43c7aae4: Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
* commit '
43c7aae4d0cf9e2d3527b093022ae1fa70d3920f':
Listen for CONNECTIVITY_ACTION in GPS Provider
Jason Sams [Wed, 22 Aug 2012 00:09:56 +0000 (17:09 -0700)]
Merge "Fix bug in grain." into jb-mr1-dev
Jason Sams [Wed, 22 Aug 2012 00:08:16 +0000 (17:08 -0700)]
Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
Brian Muramatsu [Tue, 21 Aug 2012 23:54:51 +0000 (16:54 -0700)]
Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
John Grossman [Tue, 21 Aug 2012 23:59:37 +0000 (16:59 -0700)]
am
b6a9ebc9: am
df441848: Merge "common_time: Move default election config to bcast." into jb-mr1-dev
* commit '
b6a9ebc9c7508694ad477992c0d9c8763a90569e':
common_time: Move default election config to bcast.
John Grossman [Tue, 21 Aug 2012 23:57:21 +0000 (16:57 -0700)]
am
df441848: Merge "common_time: Move default election config to bcast." into jb-mr1-dev
* commit '
df441848164a4cded48595abf64f379c31e026f5':
common_time: Move default election config to bcast.
John Grossman [Tue, 21 Aug 2012 23:54:36 +0000 (16:54 -0700)]
Merge "common_time: Move default election config to bcast." into jb-mr1-dev
John Grossman [Tue, 21 Aug 2012 23:39:11 +0000 (16:39 -0700)]
common_time: Move default election config to bcast.
Change the default master election and arbiration to use broadcast
instead of multicast. As nice as the idea of using multicast for
discovery is, in the end it had just proven to be too unreliable in
random people's home infrastructures as well as the more complicated
managed infrastructures we are using internally. Multicast still
works, and the service can still be configured to use it, but for now
we are switching to broadcast.
Also, add runtime checks to filter out our own broadcast traffic as
there does not seem to be any good sockopt in linux to do this for us
(there is one for multicast, but not broadcast).
Change-Id: I8ada3541cceca2e76c7a0c1a624a72026122c312
Nick Pelly [Tue, 21 Aug 2012 23:34:21 +0000 (16:34 -0700)]
am
8c37dc72: am
4a81ef8f: Merge "Fix some location issues exposed by CTS." into jb-mr1-dev
* commit '
8c37dc72c41c6ed54c1e6aa56a7adca9cce3568d':
Fix some location issues exposed by CTS.
Nick Pelly [Tue, 21 Aug 2012 23:32:31 +0000 (16:32 -0700)]
am
4a81ef8f: Merge "Fix some location issues exposed by CTS." into jb-mr1-dev
* commit '
4a81ef8fd3207b06a65709338470d1e6ebed8620':
Fix some location issues exposed by CTS.
Brian Muramatsu [Tue, 21 Aug 2012 23:30:57 +0000 (16:30 -0700)]
Listen for CONNECTIVITY_ACTION in GPS Provider
Bug:
7020678
The broadcast receiver in GpsLocationProvider now listens for
CONNECTIVITY_ACTION changes. Set the intent filter so that
it catches those actions and updates the network state.
Change-Id: I7efd393dfe2aa8b172dd6701d42ff9ed687648a2
Nick Pelly [Tue, 21 Aug 2012 23:29:54 +0000 (16:29 -0700)]
Merge "Fix some location issues exposed by CTS." into jb-mr1-dev
Nick Pelly [Tue, 21 Aug 2012 23:25:47 +0000 (16:25 -0700)]
Fix some location issues exposed by CTS.
Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059
Selim Gurun [Tue, 21 Aug 2012 23:18:43 +0000 (16:18 -0700)]
am
e62bf6b7: (-s ours) am
a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
* commit '
e62bf6b7e407801d523f235c8d878619a752f7b1':
Small tidy up to getDefaultUserAgent. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:15:23 +0000 (16:15 -0700)]
am
a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
* commit '
a6d16993eb6b8834095b8e308523b2d28259e430':
Small tidy up to getDefaultUserAgent. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:13:31 +0000 (16:13 -0700)]
am
0cf5fdb5: (-s ours) am
b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
* commit '
0cf5fdb57dc9dab6c62c7560c00b1b6200e23947':
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:12:55 +0000 (16:12 -0700)]
Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
Selim Gurun [Tue, 21 Aug 2012 23:08:34 +0000 (16:08 -0700)]
am
b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
* commit '
b62999c136802f5ab0b95308b3751702d72afcb8':
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
Jonathan Dixon [Mon, 20 Aug 2012 23:37:15 +0000 (16:37 -0700)]
Small tidy up to getDefaultUserAgent. DO NOT MERGE
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.
Bug:
6329117
Clean cherry pick:
d1c4faa5a4c2be71d529d35572c5f807beee7ddc
Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
Stephen Hines [Tue, 21 Aug 2012 23:07:11 +0000 (16:07 -0700)]
am
c744c14a: am
cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
* commit '
c744c14ae770b01195da843e614ad1046f6f652a':
Switch to v8 (and appropriate llvm-rs-cc stuff).
Selim Gurun [Tue, 21 Aug 2012 23:06:04 +0000 (16:06 -0700)]
Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
Stephen Hines [Tue, 21 Aug 2012 23:04:37 +0000 (16:04 -0700)]
am
cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
* commit '
cdb05977acede73c1362e8365a196839078fc896':
Switch to v8 (and appropriate llvm-rs-cc stuff).
Stephen Hines [Tue, 21 Aug 2012 23:01:30 +0000 (16:01 -0700)]
Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev