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

119404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
958a7f725d am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:43:56 +00:00
Dirk Dougherty
35ad8886f2 am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit 'acec746b8963410d4a9324df46272ac91f846868':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:37:57 +00:00
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
 2014-02-12 23:33:43 +00:00
Dirk Dougherty
55362018c9 am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:30:19 +00:00
Joe Fernandez
e5dc0c3991 am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
  MediaRouter Developer Guide
 2014-02-12 23:29:38 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
 2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1 am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
  MediaRouter Developer Guide
 2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4 am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 15:12:08 -08:00
Dave Platt
34cc9f9056 am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 23:10:36 +00:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Joe Fernandez
70a2adc817 MediaRouter Developer Guide 
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html

Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
 2014-02-12 14:12:15 -08:00
Ricardo Cervera
481993e92c am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '3cb62db29583d277ba630ee1644617fff5b615e5':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 22:08:33 +00:00
Ricardo Cervera
6fc66187b1 am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '7d3344fd9c71fc3c7202250a6b4752d30da3295d':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 22:08:30 +00:00
Ricardo Cervera
49968bb559 am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit '6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 22:08:27 +00:00
Ricardo Cervera
3cb62db295 am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 22:02:53 +00:00
Ricardo Cervera
7d3344fd9c am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '58305f88fdf111f960869340d54f46387fcab4bf':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 22:02:49 +00:00
Ricardo Cervera
6960ad58ac am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit 'ac74a5245bf115c4b5e23a3db515c0c3b5166662':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 22:02:43 +00:00
Ricardo Cervera
640e0c89c3 am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:59:39 +00:00
Ricardo Cervera
58305f88fd am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit 'bff7db19e3bbd2997490beec671b52e4e925c0a5':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:59:36 +00:00
Ricardo Cervera
ac74a5245b am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit '566e4df8c3ff66fae6c343524272d332510e26f4':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:59:33 +00:00
Ricardo Cervera
36547014a3 am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:56:29 +00:00
Ricardo Cervera
bff7db19e3 am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '521a54d0cc5288c4467652f4d773f372eebe970b':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 21:56:27 +00:00
Ricardo Cervera
566e4df8c3 am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit 'ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 21:56:24 +00:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries. 
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
 2014-02-12 13:31:14 -08:00
Ricardo Cervera
670944aa72 Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 2014-02-12 21:05:32 +00:00
Ricardo Cervera
521a54d0cc Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 2014-02-12 21:04:40 +00:00
Ricardo Cervera
ca8757bfc5 Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 2014-02-12 21:04:00 +00:00
Craig Mautner
8dfda07dd4 am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev 
* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
  Don't add windows from exiting app tokens twice.
 2014-02-12 21:01:47 +00:00
Ricardo Cervera
10227d9c37 docs: Added Revision 3 of Google APIs System Image. 
Updated Google Play services version to 4.2.42 too.

Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
 2014-02-12 12:59:46 -08:00
Craig Mautner
731c30c17d Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev 2014-02-12 20:56:36 +00:00
Craig Mautner
ac90c19cab Don't add windows from exiting app tokens twice. 
If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.

Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
 2014-02-12 12:37:17 -08:00
John Spurlock
ae5708db9d am c4aee98a: Improve error handling in listener services. 
* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
  Improve error handling in listener services.
 2014-02-12 19:36:25 +00:00
John Spurlock
c4aee98a62 Improve error handling in listener services. 
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
 2014-02-12 14:31:36 -05:00
Narayan Kamath
3caed58ac7 am 8fa3f443: am 54e7f53f: Merge "Fix build." 
* commit '8fa3f44342f3089aaf48de5c5a6f5a3e5d346cc7':
  Fix build.
 2014-02-12 19:23:45 +00:00
Paul Duffin
0741e11c65 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 19:23:01 +00:00
Narayan Kamath
fc268ecae1 am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 19:22:56 +00:00
Dianne Hackborn
97de064a9a am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '133f6826e58aa7643858d4e50630103eb01f1815':
  Runtime resource overlay, iteration 2, test cases
 2014-02-12 19:22:24 +00:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp 
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
 2014-02-12 11:05:59 -08:00
Narayan Kamath
8fa3f44342 am 54e7f53f: Merge "Fix build." 
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
 2014-02-12 09:29:55 -08:00
Narayan Kamath
54e7f53fce Merge "Fix build." 2014-02-12 17:26:58 +00:00
Scott Main
aa318b2851 am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit '879592d89a78383a9e3cd29d53357f34337e5f04':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:09:06 +00:00
Dirk Dougherty
17f0d48ccf am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18':
  Update generated docs for Google Play Services.
 2014-02-12 17:09:03 +00:00
Scott Main
879592d89a am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 
* commit 'bc64716cfb1269d07b64f89c3b46800afa5dc266':
  add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
 2014-02-12 17:06:32 +00:00
Dirk Dougherty
8b6597bd07 am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play Services. 
* commit 'b6ecc342d3e9f355a78a0a10e613bbda31286f3a':
  Update generated docs for Google Play Services.
 2014-02-12 17:06:26 +00:00