66020 Commits

Author SHA1 Message Date
Joe Malin
20176edc4f Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1 2012-04-19 10:08:06 -07:00
Alexander Lucas
941fceedad am 773740ed: Initial commit of backup API section of cloudsync class.
* commit '773740ed79075e6daffaea0c62857348ab54d93e':
  Initial commit of backup API section of cloudsync class.
2012-04-18 20:20:28 -07:00
Alexander Lucas
773740ed79 Initial commit of backup API section of cloudsync class.
Branch switch from ics-mr0, original post here:
https://android-git.corp.google.com/g/#/c/150873/

Change-Id: I4c53b99bd326c9f8fa485392e87dfba35e662936
2012-04-18 20:13:46 -07:00
Scott Main
e6ba1cb5a0 am 99e83bc4: docs: move the location class into basics/
* commit '99e83bc43abab567d16515eaf51bd9cb9eb3b5fb':
  docs: move the location class into basics/
2012-04-18 19:55:19 -07:00
Scott Main
99e83bc43a docs: move the location class into basics/
Change-Id: I0a5025ffbce4f25dc6c1b8f819a8c27def437649
2012-04-18 19:43:11 -07:00
Quddus Chong
0691f70ad8 am 13bb0791: Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1
* commit '13bb0791a1cec6a678db3bd7ab23060b3bb911ae':
  docs: Added missing comma in code snippet. Bug: 6322757
2012-04-18 17:02:48 -07:00
Quddus Chong
13bb0791a1 Merge "docs: Added missing comma in code snippet. Bug: 6322757" into ics-mr1 2012-04-18 17:00:32 -07:00
Joe Fernandez
80101a03df am 68822239: docs: Android SDK r19 Release Notes
* commit '68822239a50206a474289a380ff78146ff486a3e':
  docs: Android SDK r19 Release Notes
2012-04-18 16:25:52 -07:00
Joe Fernandez
68822239a5 docs: Android SDK r19 Release Notes
Change-Id: I9db59116259d087f03598f87aac099772a831eff
2012-04-18 10:45:42 -07:00
Fred Chung
59ec795a07 am 3d467946: Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1
* commit '3d467946b2950c6a5e4946c49a33cf4c8d68df20':
  Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:49:30 -07:00
Fred Chung
3d467946b2 Merge "Updated "Making your App Location Aware" class to include information on location provider enable check." into ics-mr1 2012-04-17 09:46:11 -07:00
Fred Chung
9340e2122e Updated "Making your App Location Aware" class to include information on location provider enable check.
Change-Id: Ie6e966b4204eed60f518759480cebc945f87d91f
2012-04-16 23:28:45 -07:00
Roman Nurik
273ad17995 am 38e09c3d: docs: Android Training: Creating Backward-Compatible UIs class
* commit '38e09c3ddb7da47a23bf4221ab678e058c7e923a':
  docs: Android Training: Creating Backward-Compatible UIs class
2012-04-13 17:51:34 -07:00
Roman Nurik
38e09c3ddb docs: Android Training: Creating Backward-Compatible UIs class
Change-Id: I9a3038839c7849ecbb144b218ce5a08bdcd35886
2012-04-13 17:27:21 -07:00
Roman Nurik
c07e9d0c67 am 19266f7b: docs: Android Training: Implementing Effective Navigation class
* commit '19266f7b02c91d21d630c99d593f83cc427cd40b':
  docs: Android Training: Implementing Effective Navigation class
2012-04-13 17:23:54 -07:00
Roman Nurik
19266f7b02 docs: Android Training: Implementing Effective Navigation class
Change-Id: Ife2f666e78e3fc0b28ad23321fd98926973e037b
2012-04-13 17:15:47 -07:00
Quddus Chong
3fa98cb02c docs: Added missing comma in code snippet.
Bug: 6322757

Change-Id: I32cbd89493287cbb5d76b59647a8ddbd59209132
2012-04-13 11:17:24 -07:00
Quddus Chong
a97a7b5a6e am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '6971153d88ebe2e441b75081a273b88424498a45':
  docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
2012-04-12 12:58:11 -07:00
Quddus Chong
6971153d88 Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1 2012-04-12 12:56:29 -07:00
Quddus Chong
ee71b1fa2d docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event).
Bug: 6318537

Change-Id: I4fb0f103bfe3ddf485e1bfa76eb39a51adce1aaa
2012-04-12 12:34:53 -07:00
Robert Ly
127fe418d6 am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1
* commit '070827e6031a312d368f33fb1ad8babff92e64e4':
  docs: fix bug 5158332
2012-04-12 12:29:20 -07:00
Robert Ly
070827e603 Merge "docs: fix bug 5158332" into ics-mr1 2012-04-12 12:27:20 -07:00
Jeff Sharkey
63de456295 am d9818244: (-s ours) Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit 'd9818244f9bf47b9e2981df7866b1ace01392fa9':
  DO NOT MERGE: Make component names visible in javadoc.
2012-04-11 19:21:15 -07:00
Jeff Sharkey
d9818244f9 Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1 2012-04-11 19:18:45 -07:00
Jeff Sharkey
aa0a453a7a DO NOT MERGE: Make component names visible in javadoc.
Change-Id: I3770ea6616b8425c387bcd27d668e3114b14335d
2012-04-11 19:15:42 -07:00
Quddus Chong
9fd39dedf9 am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit 'c08787fc96473b5738a4c024a13a8c7d24af496b':
  SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971
2012-04-11 16:10:33 -07:00
Quddus Chong
c08787fc96 Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1 2012-04-11 16:07:01 -07:00
Justin Mattson
4ea7bfea31 Merge "Check if WallpaperService is enabled" into ics-aah 2012-04-11 15:55:36 -07:00
Quddus Chong
3790001c20 SDK doc change: Fixed typo and added method parentheses in line 206.
Bug: 6318971

Change-Id: I57f3c7aff6209269ca0d95d616e551e2100eeb54
2012-04-11 15:47:57 -07:00
Scott Main
7d4a2ad8c7 am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:35:26 -07:00
Scott Main
71e8f4c152 Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1 2012-04-11 11:32:40 -07:00
Robert Ly
21c9ae0458 docs: fix bug 5158332
Change-Id: I4ced8e7808727a6789732d10601fe6aa4985d8ba
2012-04-10 16:05:23 -07:00
John Grossman
5f48909604 Merge "TimedAudio: Track of the number of pending frames." into ics-aah 2012-04-10 15:43:17 -07:00
Robert Ly
82321d1fbf am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
2012-04-10 14:26:27 -07:00
Robert Ly
2ce5444d63 am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
2012-04-10 14:26:25 -07:00
Robert Ly
c4bbc7b4e4 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
2012-04-10 14:26:23 -07:00
Robert Ly
23f08c6d64 Merge "docs: fixing broken link for bug 6104366" into ics-mr1 2012-04-10 14:24:00 -07:00
Robert Ly
2e9dac4b05 Merge "docs: fixing ndk bug 5991108" into ics-mr1 2012-04-10 14:23:50 -07:00
Robert Ly
876b7b876e Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 2012-04-10 14:23:37 -07:00
Robert Ly
621ff7d1a5 docs: fixing ndk bug 5991108
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
2012-04-10 13:30:45 -07:00
Robert Ly
41a8c7e68a docs: fixing broken link for bug 6104366
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
2012-04-10 13:20:44 -07:00
Robert Ly
af16675097 docs: fixing renderscript doc bug 6111834
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
2012-04-10 11:56:33 -07:00
Justin Mattson
4233f26249 Check if WallpaperService is enabled
If WallpaperService is disabled, don't delay starting SurfaceFlinger
until it is.

Change-Id: I95db6b7bc791329e2bae33472cfeb125e5f6f324
2012-04-09 18:36:15 -07:00
John Grossman
e843f378c9 TimedAudio: Track of the number of pending frames.
Keep track of the number of frames pending in the timed audio queue so
we can implement framesReady in O(1) time instead of O(N).  This
change partially addresses bug 6020970; the bug will be completely
addressed once this change has been up-integrated into master.

Change-Id: I599eb15ea1f6d715b97b30e65214fb6fadd169df
Signed-off-by: John Grossman <johngro@google.com>
2012-04-09 18:04:49 -07:00
Scott Main
14d3b807b7 am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices
2012-04-09 17:08:09 -07:00
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