drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,616 Commits 1 Branch 0 Tags
Commit Graph

64616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
e730562653 am 2efd1184: Merge "Use NULL not 0 for pointers" 
* commit '2efd1184f9c67eaebf68a5125232fcc2adb56387':
  Use NULL not 0 for pointers
 2011-12-15 16:19:28 -08:00
Scott Main
6efb6cc043 am f15974a3: am 6e37a304: am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class 
* commit 'f15974a37f87e32eedc9005ab8a8be6e7a1d72b0':
  docs: Android University - Camera class
 2011-12-15 16:17:08 -08:00
Glenn Kasten
2efd1184f9 Merge "Use NULL not 0 for pointers" 2011-12-15 16:16:55 -08:00
Scott Main
f15974a37f am 6e37a304: am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class 
* commit '6e37a304c6e7eed667c1d692c2ad501ec025a254':
  docs: Android University - Camera class
 2011-12-15 16:14:36 -08:00
Scott Main
6e37a304c6 am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class 
* commit 'fc6ac0f28f9f7d06963fb330b218376099a91596':
  docs: Android University - Camera class
 2011-12-15 16:12:23 -08:00
Scott Main
fc6ac0f28f am 564e8aa4: docs: Android University - Camera class 
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
  docs: Android University - Camera class
 2011-12-15 16:10:10 -08:00
Scott Main
ab7ff679f2 am 14ed7262: am 608461ff: am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs 
* commit '14ed7262e46a0e61f0dc7d4cd3263296bfd2a82b':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
 2011-12-15 16:03:13 -08:00
Scott Main
564e8aa41c docs: Android University - Camera class 
Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
 2011-12-15 16:01:59 -08:00
Scott Main
14ed7262e4 am 608461ff: am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid 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
 2011-12-15 16:00:48 -08:00
Scott Main
608461ffd5 am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge 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
 2011-12-15 15:58:33 -08:00
Scott Main
19552e95db am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: 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
 2011-12-15 15:55:31 -08:00
Scott Main
d25ad2fdbb cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 
docs: remove some "new" tags from side navs

Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
 2011-12-15 15:43:21 -08:00
Jeff Sharkey
a120d88ebd am 27c751dc: Merge "Restrict app data on metered networks." 
* commit '27c751dc0011fca9f88502a720670457cc22793f':
  Restrict app data on metered networks.
 2011-12-15 15:39:52 -08:00
Jeff Sharkey
27c751dc00 Merge "Restrict app data on metered networks." 2011-12-15 15:37:21 -08:00
Marco Nelissen
84daecf281 am 24ef465d: Merge "Add ContentProvider.dump()" 
* commit '24ef465d7f8d50484ffe7c8f79effad25a5f85d1':
  Add ContentProvider.dump()
 2011-12-15 14:44:07 -08:00
Marco Nelissen
24ef465d7f Merge "Add ContentProvider.dump()" 2011-12-15 14:41:36 -08:00
Jeff Sharkey
f60d0afd1e Restrict app data on metered networks. 
This separates the definition of "metered network" and "network with
limit."  For now, all mobile networks are considered metered.

Bug: 5571454
Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
 2011-12-15 14:30:04 -08:00
Scott Main
b47fd2955f am b408531f: am a739235a: am 43834487: docs: remove some "new" tags from side navs 
* commit 'b408531f008f30a0afab003a82137baed206b00a':
  docs: remove some "new" tags from side navs
 2011-12-15 13:18:07 -08:00
Scott Main
b408531f00 am a739235a: am 43834487: docs: remove some "new" tags from side navs 
* commit 'a739235aed598fbd40c63d5e01e8bf55836b0de0':
  docs: remove some "new" tags from side navs
 2011-12-15 13:16:27 -08:00
Scott Main
a739235aed am 43834487: docs: remove some "new" tags from side navs 
* commit '43834487a183b69783b0de270f9b761f3afffdc1':
  docs: remove some "new" tags from side navs
 2011-12-15 13:14:41 -08:00
Jason Sams
7d6bfab4bd Merge "Element HAL sturct, script side getters" into graphics-dev 2011-12-15 13:13:08 -08:00
Scott Main
43834487a1 docs: remove some "new" tags from side navs 
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
 2011-12-15 13:11:12 -08:00
Marco Nelissen
18cb28756c Add ContentProvider.dump() 
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
 2011-12-15 12:13:59 -08:00
Jeff Sharkey
d94b407709 am 8a0a72c7: Merge "Move NMS to CONNECTIVITY_INTERNAL permission." 
* commit '8a0a72c7c18d1143983cea1c49b666f534262fa1':
  Move NMS to CONNECTIVITY_INTERNAL permission.
 2011-12-15 11:55:24 -08:00
Jeff Sharkey
8a0a72c7c1 Merge "Move NMS to CONNECTIVITY_INTERNAL permission." 2011-12-15 11:53:05 -08:00
Jeff Sharkey
c4942bc960 am 56381b54: Merge "Clear reply before writing exception." 
* commit '56381b548148dfd2dee3e08613f70428fbf3e272':
  Clear reply before writing exception.
 2011-12-15 11:53:02 -08:00
Jeff Sharkey
56381b5481 Merge "Clear reply before writing exception." 2011-12-15 11:51:32 -08:00
Scott Main
28e1b3f3c1 am 3766a7a2: am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '3766a7a27535101e62af958b1d2d710daa166d7d':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:15:57 -08:00
Scott Main
3766a7a275 am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '7e065061bb47fe88421a6edf62c846144e30fcd8':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:13:31 -08:00
Scott Main
7e065061bb am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:11:39 -08:00
Scott Main
481cd5a893 am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '3d672e1e789e171e913605945efe95a477ab0505':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:08:51 -08:00
Glenn Kasten
ae483b45c4 am d9a723bc: Merge "Fix build error when verbose logging is enabled" 
* commit 'd9a723bc922a8fabf5c2df5d6cf838623266c63b':
  Fix build error when verbose logging is enabled
 2011-12-15 11:00:31 -08:00
Scott Main
587a6dc839 am 4fbed598: am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit '4fbed59804bb50c79aa773de4b20bf6652680578':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 11:00:29 -08:00
Martijn Coenen
8f7f40203e am cb1b2b8b: Merge "Fix NPE on mock NDEF tech operations." 
* commit 'cb1b2b8b1ee39e138cb93905dc2d65ad755d4a23':
  Fix NPE on mock NDEF tech operations.
 2011-12-15 11:00:25 -08:00
Scott Main
611e44e1c7 am ed29dc09: am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'ed29dc09bf96bbf068fd1b4cda0d98daeed6bf19':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 11:00:22 -08:00
Glenn Kasten
d9a723bc92 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Scott Main
4fbed59804 am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'fbc17eccea267c7cee344ac7e7898709f86b37df':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:45:50 -08:00
Scott Main
3d672e1e78 Android U Class: Monetization / Ads without Compromising User Experience 
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
 2011-12-15 10:44:11 -08:00
Scott Main
fbc17eccea am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'cf927f229f55849caf3461621023b5bd61908334':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:43:46 -08:00
Scott Main
cf927f229f am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:41:18 -08:00
Scott Main
aed4ced655 Android U Class: Developing Android Applications for the Enterprise. 
This class uses a sample app.

Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
 2011-12-15 10:38:32 -08:00
Martijn Coenen
cb1b2b8b1e Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Martijn Coenen
23fc93a7c1 Fix NPE on mock NDEF tech operations. 
Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
 2011-12-15 10:28:52 -08:00
Scott Main
ed29dc09bf am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:17:15 -08:00
Scott Main
ecaee21d30 am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:15:21 -08:00
Scott Main
e4e6c06641 am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:13:07 -08:00
Victoria Lease
3148a2713f am 3c65fad4: Merge "URL-decode tel: URIs." 
* commit '3c65fad4de52f321f5fd1263b795cd0227728c8c':
  URL-decode tel: URIs.
 2011-12-15 10:11:17 -08:00
Romain Guy
b4fb81773c am 18ca25be: Merge "Generate even fewer GL commands" 
* commit '18ca25be58be75be78cdce7541b6b082a4b3864f':
  Generate even fewer GL commands
 2011-12-15 10:10:48 -08:00
Dianne Hackborn
06e6ddbf99 am 51a0e745: am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '51a0e745ee29aa90e2c8c3d7c7bdc083bdc0028d':
  Fix some java docs.
 2011-12-15 10:10:38 -08:00
Glenn Kasten
6f42a33a2b am 25adf474: Merge "Fix indentation and whitespace" 
* commit '25adf474775acb3eea260cb0a6251cf43ff798ce':
  Fix indentation and whitespace
 2011-12-15 10:10:27 -08:00