65975 Commits

Author SHA1 Message Date
Scott Main
a5894871b2 Merge "docs: Add 101 class about supporting various devices" into ics-mr1 2012-04-09 17:06:15 -07:00
Scott Main
60e5e432d9 docs: Add 101 class about supporting various devices
Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14
2012-04-09 16:39:38 -07:00
Scott Main
ba8f435947 docs: add 101 class about intents, Interacting with Other Apps
Change-Id: I3242adafd99c34fcec4e4cece20e8c89d338c8a1
2012-04-09 16:37:11 -07:00
John Grossman
e1d6c080f0 Make common_time more deferential when coming out of networkless mode.
Addresses issues seen in bug 6260139.

This is a really tough bug to repro, but there is no doubt that it is
happening occasionally on our super huge A@H subnet.  I have collected
data all weekend; the failure did not occur, but I got enough to have
a theoretical sequence of events which could trigger this behavior.
The sequence goes like this.

1) A network is running and happy with a timeline master M,
   maintaining timeline X.
2) Device B boots, but its network is taking a long time to come up.
   After 60 seconds of waiting for the network to come up, device B
   goes into networkless master mode and creates timeline Y.
3) Device B's network comes up.  It immediately sends a master
   announcement saying that it is the current low-priority master of
   timeline Y (its low priority because it has never had any real
   clients)
4) Master M ignores B because B is low priority.
5) Device C boots and sends out a who is master request.  It is a race
   between M and A to see who will respond first.  In this case, A
   responds first.
6) C sends B a request which B receives.  B now has its first client
   and is now high priority.  In this scenario, B matches M in all
   aspects of the priority ranking function, including winning the tie
   breaker (larger MAC address when interpreted as a 48 bit integer)
7) M sends its master announcement; it is ignored by B since B
   now wins in the ranking function vs M.
8) Finally, B sends its next master announcement.  M sees it, realizes
   that there is a higher priority master out there (looks like a
   bridged network scenario to M).  M gives up master status along
   with timeline X.  The clients of M become clients of B and move
   from timeline X to timeline Y (something which should only be
   needed during an actual network bridging event)

This change has a few different things meant to severely minimize the
chance that this can happen.

First, and the most important change, is that networkless masters do
not immediately announce themselves as masters on the network they are
joining.  Instead, they transition into Ronin to discover any
pre-existing masters on the network.  If there are no masters out
there, the device will simply transition back to master and continue
to maintain the timeline it had in networkless mode.  In the scenario
above, however, B should discover M and become its client, preserving
the established timeline X.

Second, any time a device experienced an interface reconfiguration
(including coming out of networkless mode), it clears its high
priority bit.  This is a good thing.  The bit used to get set again
any time...

1) The device is master and receives a client request.
2) The device becomes a client of another master on the network.
3) The device becomes a master.

Number 3 in this list is a mistake.  The high priority bit should only
be set for devices during master election which have been
participating in a timeline which has been used by multiple devices.
We know that this is the case when we are master and receive a
request.  We also know that this is the case when we hear from a
master and decide to become its client.  Simply becoming a master
should not make us high priority.  This behavior has been removed.

Third, timeouts have been adjusted just for some extra "stickyness"
when it comes to master status.  Clients now say in the Ronin state
for up to 10 seconds looking for a master sending up to 20 discovery
requests, instead of only 3 seconds (sending 6 requests).  The
wait-for-election timeout has been adjusted up from 5 seconds to 12.5
seconds to track the longer election cycle as well.  Also, while in
steady-state, clients will now wait until 10 packets (10 seconds)
have not been answered by its master before giving up and dropping
into Ronin.

Change-Id: I438b39f31265e34d6719d4adfa9e8b95a2afc188
Signed-off-by: John Grossman <johngro@google.com>
2012-04-09 15:33:53 -07:00
Scott Main
faef0d0f64 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:24:17 -07:00
Scott Main
ede62bb6ee Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 2012-04-09 15:21:53 -07:00
Scott Main
ec73b7c5e6 am ae01af5e: docs: fix a few link titles in tv class
* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class
2012-04-09 13:03:20 -07:00
Scott Main
ae01af5efd docs: fix a few link titles in tv class
Change-Id: I9d87d6a5625c9a95d25354572d35990b37efbba6
2012-04-09 12:58:26 -07:00
Scott Main
979c4f5908 docs: fix NDK r7c release data and remove "new" tag
Change-Id: I37d2dfb46aef66b75cfd93a21005748358d457ec
2012-04-09 11:15:35 -07:00
Scott Main
3f23b71364 am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"
2012-04-09 10:15:59 -07:00
Scott Main
5f2570773d Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 2012-04-09 10:13:58 -07:00
Scott Main
2d6faf9538 docs: add 101 Training class "Building Your First App"
Change-Id: I9a1f27dc2b44fac8b0e9fbeb9326b5c62a93bc41
2012-04-09 10:03:35 -07:00
Joe Fernandez
014ac37a99 am 1bf704bd: docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
* commit '1bf704bd1878fa372cfa50e7166d6ddcb1ba1369':
  docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
2012-04-06 15:47:21 -07:00
Joe Fernandez
1bf704bd18 docs: small fixes for Accessibility dev guide (Eyes-Free Keyboard)
Change-Id: I561e805b2d48910ddf66432f6df40086fe59c597
2012-04-06 15:29:36 -07:00
Scott Main
f030c948b7 am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
2012-04-05 13:20:28 -07:00
Scott Main
2b0267dc36 docs: Deprecate the old UI guidelines about Activity/Task and Menus
Change-Id: Ife0079ecd2285eca92833a8ff32e9b4545086448
2012-04-05 13:08:55 -07:00
Alexander Lucas
028e6dd6a9 am ad606697: Removed HTML artifact from index page
* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page
2012-04-05 11:43:21 -07:00
Alexander Lucas
ad6066970a Removed HTML artifact from index page
Change-Id: Ibeef033ea2051a91056e53774345c48697f73a39
2012-04-05 11:29:27 -07:00
Justin Koh
db9b114b2e Merge "Adds flag argument to setMasterMute." into ics-aah 2012-04-05 10:40:29 -07:00
Justin Koh
0273af55cf Adds flag argument to setMasterMute.
Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
2012-04-04 18:40:36 -07:00
Scott Main
31361742b7 am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-04 17:51:08 -07:00
Scott Main
153f8fe420 docs: Android U: Displaying Bitmaps Efficiently
Change-Id: I749f6dd82438fc0902b892e9b918243fc0a826d3
2012-04-04 17:45:24 -07:00
Trevor Johns
655aff22aa am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article
2012-04-04 16:52:53 -07:00
Trevor Johns
e07b585065 Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 2012-04-04 16:51:18 -07:00
Trevor Johns
41e6f351c6 Docs: Fixing typo in "Testing from Other IDEs" article
Fixing typo in Dev Guide article: 'android update-test-project'
should be 'android update test-project'.

Change-Id: Ie42a0b627d30d2a72fa081ca13bceaacdfd5aa03
http://developer.android.com/guide/developing/testing/testing_otheride.html
2012-04-04 16:38:28 -07:00
Fred Chung
37d5178485 am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.
2012-04-04 11:47:48 -07:00
Fred Chung
f336b9fce8 Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1 2012-04-04 11:45:21 -07:00
Roman Nurik
8659a2d190 am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)
2012-04-04 10:55:49 -07:00
Roman Nurik
fa840e2b9f Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 2012-04-04 10:53:58 -07:00
Fred Chung
20f64fab8d Updated sample app for Android Training class: Making Your App Location Aware.
Change-Id: I819a79b337bbdc33948c17cc5456e6406eb3bf98
2012-04-04 10:53:34 -07:00
Roman Nurik
b20f1201fd docs: Android Design: v3 update (settings, navigation)
Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688
2012-04-04 10:31:11 -07:00
Justin Koh
bff6a514da Merge "Persists the master mute volume setting." into ics-aah 2012-04-04 09:45:27 -07:00
Justin Koh
57978ed862 Persists the master mute volume setting.
Persists the master mute volume setting across reboots.

TESTED = runs on Tungsten.

Change-Id: I9628b9369ca528b22413f62a9e7d697bae61d8ac
2012-04-03 17:37:58 -07:00
Jason Noguchi
f499a0722b am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:30:55 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test.
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
2012-04-03 17:01:50 -07:00
Megha Joshi
24748143af am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1
* commit '43562ecf434092308765e2c31377c46612ba61bb':
  Creating new "Optimizing for TV" training.
2012-04-03 16:10:25 -07:00
Megha Joshi
43562ecf43 Merge "Creating new "Optimizing for TV" training." into ics-mr1 2012-04-03 16:08:29 -07:00
Megha Joshi
931ff55a90 Creating new "Optimizing for TV" training.
Change-Id: Id2f35e07460f4c900facd364631a09c369b45310
2012-04-03 15:59:02 -07:00
Jason Noguchi
e371ed8de5 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 15:32:30 -07:00
Jason Noguchi
6e6d8df5d0 Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 2012-04-03 15:30:22 -07:00
Scott Main
fcdf5217e0 am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1
* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo
2012-04-03 14:00:24 -07:00
Scott Main
0687c83032 Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 2012-04-03 13:58:16 -07:00
Scott Main
7970558e75 docs: change markup for "new" tags to avoid the new tags wraping solo
Change-Id: If88d3cc173080db101ea5af9dc728653a2176a46
2012-04-03 13:25:47 -07:00
Fred Chung
33c99ba697 am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1
* commit '04a73fb65c7fc6e8a02db98ea38ed722f60e9222':
  Android Training: Making Your App Location Aware
2012-04-03 13:18:25 -07:00
Fred Chung
04a73fb65c Merge "Android Training: Making Your App Location Aware" into ics-mr1 2012-04-03 13:16:42 -07:00
Fred Chung
e2483a240e Android Training: Making Your App Location Aware
Change-Id: I7091f1fd10707c0397fe0d8bc066d38dcd5174ec
2012-04-03 11:09:43 -07:00
Joe Fernandez
ade335016e am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1
* commit '945b7cb324f3bdfcf13efbe7bdf6a60f7163ed9a':
  docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)
2012-04-03 10:05:17 -07:00
Alexander Lucas
31e1e27107 am 95dc3b50: Merge "initial accessibility class commit" into ics-mr1
* commit '95dc3b50fc2726959850efd64f47a78cb30fc090':
  initial accessibility class commit
2012-04-03 10:05:15 -07:00
Joe Fernandez
945b7cb324 Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1 2012-04-03 10:03:35 -07:00
Alexander Lucas
95dc3b50fc Merge "initial accessibility class commit" into ics-mr1 2012-04-03 10:02:48 -07:00