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

122230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
f12fa01220 am 72e2c2a0: am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '72e2c2a0b4df1d48e19b055d353094000c021c22':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:33:34 +00:00
Ricardo Cervera
72e2c2a0b4 am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit 'bb6c94f96767ad9f97d35763ef97b8aa17b32c9c':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:29:55 +00:00
Ricardo Cervera
bb6c94f967 am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '8f8a614534bf9de38b214b74d28a7aea69959f18':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:27:25 +00:00
Ricardo Cervera
8f8a614534 am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '294d5f790a564ac5f21d3dcfd1054abe544505a5':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 07:25:04 -08:00
Leon Scroggins III
307023f550 Merge "In nativeDecodeFileDescriptor, use fdopen." 2014-01-16 15:23:35 +00:00
Craig Mautner
441b57bce9 am 593a4e6f: Fix NPE when destroyActivity occurs after detach. 
* commit '593a4e6f982cecddc3f2f6107044b5e12fab3e20':
  Fix NPE when destroyActivity occurs after detach.
 2014-01-16 15:22:27 +00:00
Craig Mautner
fc8fa54f80 am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev 
* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
  Cleanup after ActivityView
 2014-01-16 15:22:15 +00:00
Ricardo Cervera
294d5f790a am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:19:30 +00:00
Craig Mautner
593a4e6f98 Fix NPE when destroyActivity occurs after detach. 
*** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
 java.lang.NullPointerException
 	at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
 	at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
 	at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
 	at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
 	at android.os.Handler.dispatchMessage(Handler.java:102)
 	at android.os.Looper.loop(Looper.java:136)
 	at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)

Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db
 2014-01-15 17:59:22 -08:00
Dianne Hackborn
c46809e997 Whoops add a line separator. 
Change-Id: Ie596527a39319fcf3f80a444fed9e62f90163ea5
 2014-01-15 17:53:02 -08:00
Craig Mautner
e9ddaa0b18 Merge "Cleanup after ActivityView" into klp-modular-dev 2014-01-16 01:49:24 +00:00
Craig Mautner
34b73dfaa3 Cleanup after ActivityView 
- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.

Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
 2014-01-15 17:47:51 -08:00
Dianne Hackborn
c8345b32c9 Merge "Add battery power use reporting to batterystats service." 2014-01-16 01:39:06 +00:00
Chris Craik
0430ee5acb Merge "Support projection of DisplayLists onto ancestors." 2014-01-16 01:31:39 +00:00
Ricardo Cervera
1d2a4e7b9f Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 2014-01-16 01:26:14 +00:00
Jeff Sharkey
4ca728c064 Detect removable and emulated secondary storage. 
Also rename existing secondary storage API to match naming
convention in rest of class.

Bug: 11536709
Change-Id: I2684c817de4982b414893d2d9927a21e3f171d53
 2014-01-15 17:00:56 -08:00
quddusc
ac6b332764 am e014eb63: am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit 'e014eb6368f380545113fc115a6002da2d124726':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-16 00:47:37 +00:00
quddusc
e014eb6368 am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit 'fc6b772f788e578ad84f21229120a6fe103d7282':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-16 00:44:54 +00:00
quddusc
fc6b772f78 am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit 'bf6d079783a48b9e0a05d9fc650d04c324c431a7':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-16 00:41:59 +00:00
quddusc
bf6d079783 am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit '2f1c2e32301018f800e0200c2d7ec01f990e0050':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-15 16:38:46 -08:00
quddusc
2f1c2e3230 am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 
* commit '3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
  docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
 2014-01-16 00:36:27 +00:00
Ricardo Cervera
f5749ac4ef am b5466418: am 7984122e: am 04666c91: am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp- 
* commit 'b5466418d1313c59801a4acafa17b86ee4950f50':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:34:05 +00:00
quddusc
3126ce6e09 Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs 2014-01-16 00:32:21 +00:00
Ricardo Cervera
b5466418d1 am 7984122e: am 04666c91: am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '7984122e5e2fbb516e43ccc0cbc3211a82197ca7':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:30:36 +00:00
Ricardo Cervera
7984122e5e am 04666c91: am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '04666c91808c5e5efa39d9a490b6f18161e65968':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:27:29 +00:00
Ricardo Cervera
04666c9180 am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '96f6ce38e383c0a2d416678bdfce41426e3f6b45':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-15 16:24:18 -08:00
Dirk Dougherty
2c5dc97a7b am e913f18c: am 26f9d980: am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit 'e913f18c5a7088ef69e5f87f75938d3cea2fd337':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:23:24 +00:00
Dirk Dougherty
39b41f32b4 am 061dc1b6: am b888739d: am dd8def1e: am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit '061dc1b6fbc2a56a987f093403855a370e705833':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-16 00:23:19 +00:00
Ricardo Cervera
96f6ce38e3 am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:20:55 +00:00
Dianne Hackborn
a7c837f043 Add battery power use reporting to batterystats service. 
Move the BatteryStatsHelper class (which computes power use based
on the raw battery stats) out of the settings app and in to the
framework.  It is now used by batterystats dump output to print
the computed power information from its current stats.

This involved a lot of refactoring of the BatteryStatsHelper code
to remove all of the UI dependencies.  I also did a bunch of cleanup
in it, such as making all power computations be in terms of mAh.

Change-Id: I8ccf2c9789dc9ad34904917ef57050371a59dc28
 2014-01-15 16:20:44 -08:00
Dirk Dougherty
e913f18c5a am 26f9d980: am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit '26f9d980575d0e1e8857f1491547094843f409b9':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:20:16 +00:00
Dirk Dougherty
061dc1b6fb am b888739d: am dd8def1e: am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit 'b888739d3857e26308942574363e072d5cfbcbad':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-16 00:20:11 +00:00
Ricardo Cervera
291fb4b5ff Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 2014-01-16 00:19:08 +00:00
Dirk Dougherty
26f9d98057 am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit '7be6af670e25db5390bb5d79bc1a35973bd0c5aa':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:17:18 +00:00
Dirk Dougherty
b888739d38 am dd8def1e: am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit 'dd8def1e15bf0726ea087f46f91c0f1d533621c9':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-16 00:17:13 +00:00
Dirk Dougherty
7be6af670e am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit 'd7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-15 16:14:13 -08:00
Dirk Dougherty
dd8def1e15 am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit '5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-15 16:14:07 -08:00
Chris Craik
f533e94703 Support projection of DisplayLists onto ancestors. 
For now, ancestor views signal the acceptance of projections with a
save(0x20)/restore pair.

During the order traversal, each view with the save(0x20) code will
collect descendent views with mProjectToContainedVolume (which still
needs to be renamed) so that they can be drawn out of order later.

- *Temporary* sample code added to HwAccelerationTest.

- Note that a projected displaylist must not be clipped.

Change-Id: I45c493e845961535b958d59c53e8aff3f8891d9f
 2014-01-15 16:14:01 -08:00
Dirk Dougherty
d7a50a6282 am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 
* commit '57801123c16a160d03dd265ca2f193b51e876186':
  Doc change: add Drive API feature page. fix link text on several pages
 2014-01-16 00:10:38 +00:00
Dirk Dougherty
5f26f2c9d2 am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 
* commit '6ec44a882b87fffb37e9dbafe8c5535f16faf349':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
 2014-01-16 00:10:34 +00:00
Dirk Dougherty
57801123c1 Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs 2014-01-16 00:08:53 +00:00
Dirk Dougherty
6ec44a882b Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs 2014-01-16 00:07:35 +00:00
Wink Saville
bef8958652 am 9bc74c4b: am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit '9bc74c4b20bc0c88d01b832517122c28439aa406':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-16 00:06:02 +00:00
Wink Saville
9bc74c4b20 am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit 'ab092bb065b09ac0caa000269025c5a5ec951973':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-16 00:03:13 +00:00
Wink Saville
ab092bb065 am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit '469881381b081157b95e8e5ee3c9293bbbc1c852':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-16 00:00:18 +00:00
Wink Saville
469881381b am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit '5775697029760ca886a287ef2c3119d5097ded56':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-15 15:57:10 -08:00
quddusc
cf27731826 am 9fa2cf62: am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 
* commit '9fa2cf62155d128dc6594662ffa57f13beffcaf9':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
 2014-01-15 23:52:33 +00:00
quddusc
a8c8aa9f0f am e0ed54cc: am 18ae7b08: am dba65d6f: am 57edc17c: am 563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda 
* commit 'e0ed54cc53363a4fe16dc50f08a88d7f22fc68b1':
  cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release.  Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
 2014-01-15 23:52:27 +00:00
Wink Saville
5775697029 am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224" 
* commit 'a6aa3199bdb676e349c28b861a04c34a4ec136e0':
  Fixed mistaken reference to "LTE". Bug 7637224
 2014-01-15 15:49:14 -08:00
quddusc
9fa2cf6215 am cf280856: am f6490353: am 77916b9a: am bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs 
* commit 'cf280856d69a63b61bc4c5e8e61033174273fb9b':
  docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
 2014-01-15 23:47:45 +00:00