summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Include roaming in NetworkIdentity.hashCode().Jeff Sharkey2011-12-161-1/+1
| | | | Change-Id: I148d95c8d08e3916a90fa78f7efee327d4b7de2a
* Merge "Move NMS observers to RemoteCallbackList."Jeff Sharkey2011-12-151-29/+33
|\
| * Move NMS observers to RemoteCallbackList.Jeff Sharkey2011-12-151-29/+33
| | | | | | | | | | | | | | Internally uses Binder.linkToDeath() to handle case where remote observer dies. Change-Id: I9ae0ee6e011a9715172fa079098b108f895ae956
* | am 6bbd38e9: am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, ↵Scott Main2011-12-155-10/+10
|\ \ | | | | | | | | | | | | | | | | | | updated some typos, wording and a screenshot." into ics-mr0 * commit '6bbd38e98615d6a2d4d4e1401a9316bfe7736486': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
| * \ am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some ↵Scott Main2011-12-155-10/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | typos, wording and a screenshot." into ics-mr0 * commit 'aeb06e34085703fe9699cdc3454558d69092bd7c': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
| | * \ am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, ↵Scott Main2011-12-155-10/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wording and a screenshot." into ics-mr0 * commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
| | | * \ Merge "Minor tweaks to Sharing class, updated some typos, wording and a ↵Scott Main2011-12-155-10/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | screenshot." into ics-mr0
| | | | * | Minor tweaks to Sharing class, updated some typos, wording and a screenshot.Adam Koch2011-12-155-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
* | | | | | am efc87005: am 5f0df1b8: am 580f0146: docs: add camera and design, remove ↵Scott Main2011-12-1529-56/+88
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users update title names for many lessons * commit 'efc870052b0988446967a6100cf03a51c3b88ce1': docs: add camera and design, remove users update title names for many lessons
| * | | | | am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update ↵Scott Main2011-12-1529-56/+88
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | title names for many lessons * commit '5f0df1b8db25859a1e99425cfd87562ef71e6478': docs: add camera and design, remove users update title names for many lessons
| | * | | | am 580f0146: docs: add camera and design, remove users update title names ↵Scott Main2011-12-1529-56/+88
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for many lessons * commit '580f0146535e7daed83aef721f505270f7b040e1': docs: add camera and design, remove users update title names for many lessons
| | | * | | docs: add camera and design, remove usersScott Main2011-12-1529-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update title names for many lessons Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
* | | | | | Merge "Emoji characters for Android"Bart Sears2011-12-153-0/+6
|\ \ \ \ \ \
| * | | | | | Emoji characters for AndroidBart Sears2011-12-133-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I887dca18bb5046a8390bf96c99d983d9c434648f
* | | | | | | am 165b3cc7: am ea627994: am fc3f8e69: Merge "Remove references to sample ↵Sparky Rhode2011-12-152-37/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application" into ics-mr0 * commit '165b3cc73fdc6fdee1c1ba1272ffd4cdb70b9cab': Remove references to sample application
| * | | | | | am ea627994: am fc3f8e69: Merge "Remove references to sample application" ↵Sparky Rhode2011-12-152-37/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit 'ea627994c3940711c27e27a6d5d98bb135944710': Remove references to sample application
| | * | | | | am fc3f8e69: Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f': Remove references to sample application
| | | * | | | Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
| | | |\ \ \ \
| | | | * | | | Remove references to sample applicationSparky Rhode2011-12-152-37/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
* | | | | | | | am eb49c9c3: am eb623347: am d37e2b35: Merge "Android U Class: Designing ↵Roman Nurik2011-12-1532-0/+4488
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effective and Intuitive App Navigation" into ics-mr0 * commit 'eb49c9c33c7ddeb5150bfea0f432226ff7730bfe': Android U Class: Designing Effective and Intuitive App Navigation
| * | | | | | | am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and ↵Roman Nurik2011-12-1532-0/+4488
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intuitive App Navigation" into ics-mr0 * commit 'eb623347f9a0c46e6ccf5791c03f99d37a0b65f8': Android U Class: Designing Effective and Intuitive App Navigation
| | * | | | | | am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App ↵Roman Nurik2011-12-1532-0/+4488
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation" into ics-mr0 * commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c': Android U Class: Designing Effective and Intuitive App Navigation
| | | * | | | | Merge "Android U Class: Designing Effective and Intuitive App Navigation" ↵Roman Nurik2011-12-1532-0/+4488
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | into ics-mr0
| | | | * | | | Android U Class: Designing Effective and Intuitive App NavigationRoman Nurik2011-12-1532-0/+4488
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Change-Id: Ic05d73c27a4ae4b18fd682e1f193acd73b8d9dc5
* | | | | | | am 52507ccd: am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, ↵Scott Main2011-12-159-6/+212
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side nav, and title changes" into ics-mr0 * commit '52507ccd17787a82cebe3b86e93c6e197b74d9c1': docs: Add training homepage, side nav, and title changes
| * | | | | | am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and ↵Scott Main2011-12-159-6/+212
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | title changes" into ics-mr0 * commit '6aee4582feae70254094e343412114c0b0abaf2d': docs: Add training homepage, side nav, and title changes
| | * | | | | am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title ↵Scott Main2011-12-159-6/+212
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes" into ics-mr0 * commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0': docs: Add training homepage, side nav, and title changes
| | | * | | | Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0Scott Main2011-12-159-6/+212
| | | |\ \ \ \
| | | | * | | | docs: Add training homepage, side nav, and title changesScott Main2011-12-159-6/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2ac6047faa7a70e06ced47665813ace4aa974af8
* | | | | | | | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Vector of pointers is risky, as there is no ownership (and the ThreadBase destructor was not deleting them, so if there were any left over at end it would leak). Replaced by a Vector of values. Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
* | | | | | | | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef
* | | | | | | | | am 6e37a304: am fc6ac0f2: am 564e8aa4: docs: Android University - Camera classScott Main2011-12-155-0/+744
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e37a304c6e7eed667c1d692c2ad501ec025a254': docs: Android University - Camera class
| * | | | | | | | am fc6ac0f2: am 564e8aa4: docs: Android University - Camera classScott Main2011-12-155-0/+744
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc6ac0f28f9f7d06963fb330b218376099a91596': docs: Android University - Camera class
| | * | | | | | | am 564e8aa4: docs: Android University - Camera classScott Main2011-12-155-0/+744
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71': docs: Android University - Camera class
| | | * | | | | | docs: Android University - Camera classScott Main2011-12-155-0/+744
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
* | | | | | | | am 608461ff: am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid ↵Scott Main2011-12-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs * commit '608461ffd5f3146c39a69496d275d7dabf1e2f90': cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
| * | | | | | am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge ↵Scott Main2011-12-150-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs * commit '19552e95db26d96977daa42cda4de8e58c6feb0a': cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
| | * | | | | am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: ↵Scott Main2011-12-150-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs * commit 'd25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b': cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
| | | * | | | cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: ↵Scott Main2011-12-152-13/+12
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
* | | | | | Merge "Restrict app data on metered networks."Jeff Sharkey2011-12-154-20/+88
|\ \ \ \ \ \
| * | | | | | Restrict app data on metered networks.Jeff Sharkey2011-12-154-20/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This separates the definition of "metered network" and "network with limit." For now, all mobile networks are considered metered. Bug: 5571454 Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
* | | | | | | Merge "Add ContentProvider.dump()"Marco Nelissen2011-12-156-0/+210
|\ \ \ \ \ \ \
| * | | | | | | Add ContentProvider.dump()Marco Nelissen2011-12-156-0/+210
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to the existing dump() facility for services. ContentProviders can now implement dump() and that info will be shown when running "dumpsys activity provider" and when taking a bugreport. Change-Id: I33b3b132e3c4f920153355cc368eda2f725a715f
* | | | | | | am a739235a: am 43834487: docs: remove some "new" tags from side navsScott Main2011-12-152-13/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'a739235aed598fbd40c63d5e01e8bf55836b0de0': docs: remove some "new" tags from side navs
| * | | | | am 43834487: docs: remove some "new" tags from side navsScott Main2011-12-152-13/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '43834487a183b69783b0de270f9b761f3afffdc1': docs: remove some "new" tags from side navs
| | * | | | docs: remove some "new" tags from side navsScott Main2011-12-152-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
* | | | | | Merge "Move NMS to CONNECTIVITY_INTERNAL permission."Jeff Sharkey2011-12-152-63/+62
|\ \ \ \ \ \
| * | | | | | Move NMS to CONNECTIVITY_INTERNAL permission.Jeff Sharkey2011-12-142-63/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6043c1b9cb10aeeafb93d1b5c60da571d2fec5c9
generated by cgit v1.1 at 2024-07-16 16:38:04 +0000