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

124208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
4c64e2e50f am e89c6ebe: Doc update: GCM changes for I/O. 
* commit 'e89c6ebeceb2a04d8ee05e73e15a899b686f811a':
  Doc update: GCM changes for I/O.
 2014-06-24 21:13:27 +00:00
Robert Ly
a1a9efeb49 am 7cfd2e03: Merge "docs: fix lmp and index pages" into klp-modular-dev 
* commit '7cfd2e03c474cccb413522b663cf08b9bbbc0cca':
  docs: fix lmp and index pages
 2014-06-24 21:00:16 +00:00
Robert Ly
2402c9d133 am 0ceb16d9: Merge "docs: Fix auto site css for screenshot frames." into klp-modular-dev 
* commit '0ceb16d96059d8769a296af8c5ca916198a2cda6':
  docs: Fix auto site css for screenshot frames.
 2014-06-24 21:00:08 +00:00
Robert Ly
06da01216c am 3158e1a6: Merge "docs: Addressed reviews and fixes for Auto dev overview" into klp-modular-dev 
* commit '3158e1a6a36c97508179d727302ca73201eb0b0d':
  docs: Addressed reviews and fixes for Auto dev overview
 2014-06-24 21:00:04 +00:00
Andrew Solovay
dd46444e54 am 619c8961: Merge "docs: Added table for the L device images." into klp-modular-dev 
* commit '619c8961fdab6cd991c5dc956e36bdcbe79bda11':
  docs: Added table for the L device images.
 2014-06-24 20:59:59 +00:00
Narayan Kamath
70bf06986a am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage" 
* commit 'b20b0629c2ea6a8e1f7bebd0791dd21e545a4605':
  Memory leak in parsePackage
 2014-06-24 14:26:45 +00:00
Narayan Kamath
b20b0629c2 am 71dfc7e9: Merge "Memory leak in parsePackage" 
* commit '71dfc7e9accc1ca3cda52bdf475b03fa2a334e78':
  Memory leak in parsePackage
 2014-06-24 14:21:14 +00:00
Quddus Chong
ed8b77e668 am 300caefb: Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev 
* commit '300caefb0ca877f45f48d4e76bc086672a6f59b6':
  docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn.
 2014-06-24 13:55:09 +00:00
Robert Ly
a5dc5869ee am 387891fd: fix resources js bug 
* commit '387891fde61a63c98ac3a81a5a0d1d7151a95d1f':
  fix resources js bug
 2014-06-24 13:55:05 +00:00
smain@google.com
071894a210 am f98b816b: update landing page gif frame to use new style 
* commit 'f98b816b936ee0beb07a66caee2cf0e3e3bed9ce':
  update landing page gif frame to use new style
 2014-06-24 13:55:01 +00:00
Narayan Kamath
152d5cd30b am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune." 
* commit '22a32d883794a7a96ff5ffb4830ea59065b3ebda':
  Explicitly list out the list of cache subdirs to prune.
 2014-06-24 12:19:10 +00:00
Narayan Kamath
22a32d8837 am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune." 
* commit '2a0f9e6a523abc28bdbc249010f5ddd184a27730':
  Explicitly list out the list of cache subdirs to prune.
 2014-06-24 12:14:12 +00:00
Narayan Kamath
816cff12e1 am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:18:23 +00:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:08:52 +00:00
Stephen Hines
ed24d3f2e9 am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit 'db3bcfb8f7c1f148bc89eea663ba5aa6fc0ece2f':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 09:26:31 +00:00
Stephen Hines
db3bcfb8f7 am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit '44023a4f20a38ed892a6181765337635d77b1de8':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 06:53:18 +00:00
Narayan Kamath
2a0f9e6a52 Merge "Explicitly list out the list of cache subdirs to prune." 2014-06-24 06:33:30 +00:00
Narayan Kamath
71dfc7e9ac Merge "Memory leak in parsePackage" 2014-06-24 06:22:45 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Stephen Hines
44023a4f20 Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 2014-06-24 00:37:45 +00:00
Stephen Hines
fcb3161e57 We need to update mPos when we copy a FieldPacker via its data[] member. 
Bug: 15756600

This change also adds a TODO/FIXME related to subAlign() and our tracking
mechanism for it. We need to further investigate how to make subAlign() work
properly if a user copies their FieldPacker.

Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
 2014-06-23 17:35:04 -07:00
Katie McCormick
e89c6ebece Doc update: GCM changes for I/O. 
Fixes for:

b/15348323
b/15349955
b/15330953

Change-Id: Ie256a76ea83cf16256cded858531dd78b8da0558
 2014-06-23 22:40:16 +00:00
Robert Greenwalt
6ca5129d80 am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit 'a77d0ef49e8c4b53e1cd794c0739584914bd6eda':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:10:37 +00:00
Robert Greenwalt
a77d0ef49e am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:02:12 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
 2014-06-23 21:51:38 +00:00
Robert Ly
7cfd2e03c4 Merge "docs: fix lmp and index pages" into klp-modular-dev 2014-06-23 21:50:10 +00:00
Marco Nelissen
c4d37f58a1 am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug
 2014-06-23 21:45:30 +00:00
Jianzheng Zhou
78c8e7c8bf DO NOT MERGE refactor wifi p2p's startDhcpServer function 
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).

Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2014-06-23 21:02:45 +00:00
Robert Ly
93de481209 docs: fix lmp and index pages 
Change-Id: Iacdc52e1514728aa81192f2b9b1ca146b39bc024
 2014-06-23 13:21:10 -07:00
Calin Juravle
ac777c8219 am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties" 
* commit '3e8368350e4098a5a5bd88fc2cb623f58c012ba2':
  Fix the initialization of some profile properties
 2014-06-23 19:44:53 +00:00
Robert Ly
387891fde6 fix resources js bug 
Change-Id: Ic44c324bd61069c4a9b3bc05251683b6c586d3b8
 2014-06-23 11:24:07 -07:00
smain@google.com
f98b816b93 update landing page gif frame to use new style 
Change-Id: I27e32cccbe64fbe32306c1404edd7f965f9ed299
 2014-06-23 10:28:04 -07:00
Baligh Uddin
15aca0aa6d am 858b47ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '858b47ca1eb9bc7d5efe183018a4053dd4d068ca':
  Import translations. DO NOT MERGE
 2014-06-23 17:27:53 +00:00
Baligh Uddin
96e98d4170 am 2d91bc23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2d91bc23128fc1ab2a958a24c84f75d653886ef1':
  Import translations. DO NOT MERGE
 2014-06-23 17:27:49 +00:00
Calin Juravle
3e8368350e am a06f5fa6: Merge "Fix the initialization of some profile properties" 
* commit 'a06f5fa6563f7fc08b7bb2305f61bf649add0b5a':
  Fix the initialization of some profile properties
 2014-06-23 17:26:29 +00:00
Quddus Chong
300caefb0c Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev 2014-06-23 17:14:09 +00:00
Quddus Chong
2789664e60 docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn. 
Change-Id: I0ea5b9c85dd79b786dabeb4923f8f0f7f26948ab
 2014-06-23 11:17:37 -07:00
Quddus Chong
d0027fd67f am 11b319c2: Merge "docs: Updated L Preview Highlights." into klp-modular-dev 
* commit '11b319c234ef32b6ebd4fb8f44f592c491281de9':
  docs: Updated L Preview Highlights.
 2014-06-23 16:45:02 +00:00
Brian Carlstrom
9e36a8cd3e am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case" 
* commit '1b98ccf275d93197c1aa746d5c492a57cd62be7f':
  Treat missing package usage data as a separate case
 2014-06-23 15:47:45 +00:00
Brian Carlstrom
1b98ccf275 am 0924ef65: Merge "Treat missing package usage data as a separate case" 
* commit '0924ef6592c3172db6ae1f3d92f845951f901486':
  Treat missing package usage data as a separate case
 2014-06-23 15:43:40 +00:00
Craig Mautner
9587ee0203 am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment." 
* commit 'a2121e497c2e82676b4bf5dc35b0015c38ddc5ab':
  Fix frontOfTask assignment.
 2014-06-23 15:00:10 +00:00
Craig Mautner
a2121e497c am 5957d6a8: Merge "Fix frontOfTask assignment." 
* commit '5957d6a889d9c9e46d260d915b9ffa66a763dd23':
  Fix frontOfTask assignment.
 2014-06-23 14:52:41 +00:00
Robert Ly
0ceb16d960 Merge "docs: Fix auto site css for screenshot frames." into klp-modular-dev 2014-06-23 14:51:00 +00:00
Ricardo Cervera
c5f20771ec docs: Fix auto site css for screenshot frames. 
Change-Id: Ied72b6c90af93ae522ae4478dcdd60b3abd39350
 2014-06-23 13:11:30 -07:00
Robert Ly
3158e1a6a3 Merge "docs: Addressed reviews and fixes for Auto dev overview" into klp-modular-dev 2014-06-23 14:51:00 +00:00
Quddus Chong
11b319c234 Merge "docs: Updated L Preview Highlights." into klp-modular-dev 2014-06-23 14:51:00 +00:00
Marco Nelissen
0eee8ac275 Merge "Fix thumbnail bug" 2014-06-23 14:50:49 +00:00
Henrik Baard
5f7ce10c93 Memory leak in parsePackage 
The method parsePackage failes to delete some resources
in case of failures.

Added delete of "package" in the cases that was previously
missed.

Change-Id: I183e9ec5864c5ed18bb48410ab41317cb3d96bda
 2014-06-23 14:03:46 +02:00
Robert Ly
12426cff73 am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev 
* commit '878325b3677584e50536c128e661b4921f2aa154':
  docs: l-preview fixes
 2014-06-23 09:56:03 +00:00