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

177817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
c6d3342064 am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit '4decc115ae4fc846fffda238569d6c55451a63af':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-13 02:57:04 +00:00
Dirk Dougherty
4decc115ae Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 2015-06-13 02:43:43 +00:00
Dirk Dougherty
a73450cd27 Doc change: move ndk docs jd into main docs tree. 
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea
 2015-06-12 15:18:07 -07:00
Andrew Solovay
ecc50268d7 am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 
* commit '6243dfd9ab25dfd11d0e09cbe02e8a863ddafe07':
  docs: Added AfW videos to "Android for Work" landing page
 2015-06-12 20:48:58 +00:00
Andrew Solovay
6243dfd9ab Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 2015-06-12 20:37:45 +00:00
Rich Slogar
afb19e27cc am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 
* commit '726db0aff535e7e734426c6c33ae2c5443e34fa5':
  docs: sdk tools 24.3.2 download updates
 2015-06-12 17:40:29 +00:00
Luan Nguyen
cce9c74f4e docs: Update JavaDoc links for Watch Face class. 
bug: 21731309
Change-Id: I4d0899f42e3150aad399efc8d1e1e4f63dc6bc9d
 2015-06-12 10:36:57 -07:00
Rich Slogar
726db0aff5 Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 2015-06-12 17:26:58 +00:00
Diego Perez
ce5a79dacf am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'd717682df97e812d4a25f93b0c9e84548767d8e1':
  New custom widgets library
 2015-06-12 16:29:59 +00:00
Diego Perez
5a53816b0d am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit 'c051c556669f88e284f2922f8d28fad2138598ae':
  Fix crash when shadowSize is 0
 2015-06-12 16:29:54 +00:00
Prashant Malani
a8cff2acb7 am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit '327b481f1f2499eaa5ab938e63a2c12c21fe7482':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-12 16:29:47 +00:00
Filip Gruszczynski
94476be6a4 am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-12 16:29:39 +00:00
Leon Scroggins III
d7959d30b6 am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '265d053da9203ebad0f2e936fa66305babc8fdae':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-12 16:29:13 +00:00
Leon Scroggins III
8c9ae41bc7 am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit '303581be5ba3875b0501cb8aa00a0228e22a6cc6':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-12 16:29:07 +00:00
Svetoslav
16c31a77f7 am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '497176975f59a939f12feefb31f2f02560b6f265':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-12 16:29:03 +00:00
Diego Perez
d717682df9 am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit '5c597c1d89c529675096c2d326c452145403979d':
  New custom widgets library
 2015-06-12 15:10:18 +00:00
Diego Perez
c051c55666 am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit 'e10e8005903572158cbb9c7f869508a247ff51ad':
  Fix crash when shadowSize is 0
 2015-06-12 15:10:14 +00:00
Diego Perez
5c597c1d89 am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'a885456426ec267d37c6a527285d965f81e14f9d':
  New custom widgets library
 2015-06-12 14:57:35 +00:00
Diego Perez
e10e800590 am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit '68155986508ef8b497228f8e60346d317e87991d':
  Fix crash when shadowSize is 0
 2015-06-12 14:57:27 +00:00
Diego Perez
a885456426 am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'ce4a9d9110436a2ea825976af7895c58303a3dac':
  New custom widgets library
 2015-06-12 14:45:26 +00:00
Diego Perez
6815598650 am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 
* commit 'f5a99437bf203eca49e8ab8f74f2c206c551289b':
  Fix crash when shadowSize is 0
 2015-06-12 14:45:21 +00:00
Luan Nguyen
b7cf23532d docs: Update JavaDoc ref links for UI training. 
Update sample snippets in 2d-picker.

bug: 21660558
bug: 19059844
Change-Id: Ibc156a21329d1549f6d33ed75130f7b6edda85b2
 2015-06-12 07:40:37 -07:00
Diego Perez
ce4a9d9110 Merge "New custom widgets library" into lmp-mr1-dev 2015-06-12 14:34:50 +00:00
Diego Perez
f5a99437bf Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev 2015-06-12 14:34:09 +00:00
Dirk Dougherty
03a216f19f am ef8c2834: Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs 
* commit 'ef8c2834f19c404cad025a4b583525b62a4b2790':
  Doc change: miscellaneous tag optimizations and edits.
 2015-06-12 01:45:36 +00:00
Dirk Dougherty
ef8c2834f1 Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs 2015-06-12 01:34:39 +00:00
Dirk Dougherty
ca9fd6f337 Doc change: miscellaneous tag optimizations and edits. 
Change-Id: I9da06cdf950894b32eedb0b63b5b7a9eb2d52003
 2015-06-11 18:31:47 -07:00
Rich Slogar
54234e8d09 docs: sdk tools 24.3.2 download updates 
Change-Id: Ie7a008e1b1a7a686436a72e049f8b7e6c1a66350
 2015-06-11 17:21:20 -07:00
Prashant Malani
327b481f1f am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit '786cd12f785374f93c19c909687ea300e41ffbc2':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-11 23:52:49 +00:00
Prashant Malani
786cd12f78 Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 2015-06-11 23:36:44 +00:00
Rich Slogar
6e56db8b7b am e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs 
* commit 'e9dd30b27687ecc0e152f73eec05399af1c04bb3':
  docs: sdk tools 24.3.2 updates
 2015-06-11 23:25:13 +00:00
Rich Slogar
e9dd30b276 Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs 2015-06-11 23:09:27 +00:00
Eric Gilmore
fb91c81fc5 am 2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs 
* commit '2f414b7612e095c383fb4052c671634d82940654':
  Removing traces out outdated GCM training class.
 2015-06-11 23:08:56 +00:00
Eric Gilmore
2f414b7612 Merge "Removing traces out outdated GCM training class." into mnc-preview-docs 2015-06-11 22:58:33 +00:00
Joe Fernandez
480d6e8e08 am e4e40c03: docs: remove obsolete FAQ pages 
* commit 'e4e40c0347e76ea4afaf7d442c4daeb9f08b2d91':
  docs: remove obsolete FAQ pages
 2015-06-11 22:56:20 +00:00
Rich Slogar
01572eaa1e docs: sdk tools 24.3.2 updates 
Change-Id: I3eb7b789985653614361505eea3aa0040ef5ea52
 2015-06-11 15:55:43 -07:00
Joe Fernandez
e4e40c0347 docs: remove obsolete FAQ pages 
These pages have not been maintained and have not been included in the
DAC navigation structure for some time.

b/19413080

redirects change: If512bdf55b16f0faf21de7db81ab26d59489da15

Change-Id: Ibc1aa5c691edb938cbb7d4b2d885f1ea8a5f6ef4
 2015-06-11 15:41:44 -07:00
Prashant Malani
d19ffd4f2c DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set" 
This reverts commit c83d3e4b72f8f25bbac39a577f125f0ca04354da.

While the above patch does help deal with the issue of "lost" kernel
alarms, experiments found it to also cause the unnecessary duplicate
setting of non-lost alarms in other devices.

This leads to a situation where the CPU constantly tries to sleep, but
occasionally keeps failing to do so, because of a collection of these
duplicate alarms constantly activating the "alarm" kernel wakeup source
, presumably due to them being triggered.

These might have accumulated over several iterations when the kernel
alarms were set again (via rescheduleKernelAlarmsLocked()).

To prevent the CPU thrashing (which heavily drains power on more
battery-constrained devices, and increases the number of alarms being
set), the aforementioned commit is backed out.

Bug: 20136729
Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
 2015-06-11 19:56:49 +00:00
Dirk Dougherty
405d58fff8 am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit 'fd7432276172790a27bd51b75e61d756772eb33b':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:40:53 +00:00
Dirk Dougherty
fd74322761 Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 2015-06-11 17:31:46 +00:00
Filip Gruszczynski
88bc9753c3 Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 2015-06-11 16:40:10 +00:00
Joe Fernandez
fd7a6b0332 am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'd1d8b843dd4b7575438339a15e610deafa060f76':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:33:02 +00:00
Joe Fernandez
d1d8b843dd Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 2015-06-11 16:24:26 +00:00
Leon Scroggins III
265d053da9 am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '81babaa318bd004a97a35d7d6d9d57c0b7f75e5f':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-11 13:33:17 +00:00
Dirk Dougherty
2805148e91 Doc change: Remove disallow /preview from indexing. 
Change-Id: I67ce4395529422a741903d3635085fdea7a2f510
 2015-06-10 18:13:54 -07:00
Rich Sloager
b656acef82 Revert "Revert "docs: studio 1.2.2.0 updates"" 
This reverts commit c9032b1472f4f54b6a7db66921975c808e7db88d.

Change-Id: Ia590d767ed5c280369fbcecd65538c7fc25158a1
 2015-06-11 00:23:42 +00:00
Doris Liu
629ba0e2b3 DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes 
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.

Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9f44b6b7448d4c21edca866132c8b59)
 2015-06-10 22:54:09 +00:00
Leon Scroggins III
303581be5b resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
Change-Id: I37a4be53f44035c1ff58ba6c4da3a14803b946c2
 2015-06-10 14:56:11 -04:00
Svetoslav
497176975f am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '34c7bd7c5ca5e41e151c93cd417efd7a28157e9d':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-10 16:34:39 +00:00
Leon Scroggins III
81babaa318 am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '7ffde4a6304dc4ad7de3154c12ce8bb0a8001a07':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:21:33 +00:00