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

95378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
c17673712a am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit 'ebdf1ccc5bd18e2f55d6f900382dabad4a287b9b':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:42:15 -08:00
Joe Malin
ebdf1ccc5b am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:40:15 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
91dad7e8a3 am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:38:37 -08:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86 cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f 
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
 2013-03-05 11:35:49 -08:00
Adam Koch
e43d5714fc am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:37:48 -08:00
Adam Koch
cc3fec699d am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '0c8dfd7d281d037df3d427ccb6bf4642b2617a63':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:36:31 -08:00
Adam Koch
0c8dfd7d28 am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1061c578b1a341ecb7286009daa9173e0b7e0dc0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:33:56 -08:00
Adam Koch
1061c578b1 am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '095aa4b611472f64bdbd1499d05b747cebc3f792':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:32:13 -08:00
Adam Koch
095aa4b611 am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:30:03 -08:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually 
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-03-05 13:05:34 +00:00
Marco Nelissen
056c610c9b am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
  Performance increase in thumbnail handling
 2013-03-04 16:31:26 -08:00
Scott Main
0793c6e84f dashboard update for 4/4/13 
Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
 2013-03-04 16:18:27 -08:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-04 10:52:49 -08:00
Brian Carlstrom
b0cbf8607f Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 2013-03-04 17:50:14 +00:00
Jeff Sharkey
237940a092 am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
  Tighten enforcement of file modes.
 2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
 2013-03-01 17:30:45 -08:00
Jeff Sharkey
c807070cb5 am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '1e5e3748d4d431e48bd4b6a461ab3a9127beff7d':
  Tighten enforcement of file modes.
 2013-03-01 17:28:32 -08:00
Jeff Sharkey
f9ed7dc96a am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
 2013-03-01 17:26:07 -08:00
Jeff Sharkey
1e5e3748d4 am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
 2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
 2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes. 
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
 2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes. 
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
 2013-03-01 16:17:09 -08:00
Scott Main
44e087bdba am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
  docs: add bdc's security doc as training article
 2013-03-01 11:11:52 -08:00
Scott Main
a3279494a4 am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '8d5b88463b37cc254ed8333506fc47bb1ec193bb':
  docs: add bdc's security doc as training article
 2013-03-01 11:09:14 -08:00
Scott Main
8d5b88463b am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '16bdd13ec7e64c04e1a17b94ffcb2a08f3b47518':
  docs: add bdc's security doc as training article
 2013-03-01 11:06:49 -08:00
Scott Main
10dda9ca64 am 00158363: docs: add bdc\'s security doc as training article 
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
 2013-03-01 11:05:12 -08:00
Scott Main
16bdd13ec7 am 00158363: docs: add bdc\'s security doc as training article 
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
 2013-03-01 11:04:27 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article 
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
 2013-03-01 09:49:41 -08:00
Nick Kralevich
199f965552 am f5276c16: Merge "installd: use correct header file." 
* commit 'f5276c16ad97d94f8773938012ae54f8c7ba450a':
  installd: use correct header file.
 2013-03-01 09:39:45 -08:00
Nick Kralevich
edb95c3f3c am 937cfa77: Merge "ZygoteInit: use correct header files." 
* commit '937cfa77c464f7dc13f686dc8f9f4667a17e80d6':
  ZygoteInit: use correct header files.
 2013-03-01 09:39:42 -08:00
Brian Carlstrom
6bae82a2ae Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding 
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
 2013-03-01 09:13:26 -08:00
Nick Kralevich
f5276c16ad Merge "installd: use correct header file." 2013-03-01 16:40:14 +00:00
Nick Kralevich
937cfa77c4 Merge "ZygoteInit: use correct header files." 2013-03-01 16:39:37 +00:00
Nick Kralevich
b3c4a0bb5c ZygoteInit: use correct header files. 
Don't define capget / capset when we already have definitions
of it in our header files.

Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
 2013-02-28 16:56:16 -08:00
Nick Kralevich
848b4c9a97 installd: use correct header file. 
Change-Id: I035524b857a04f8400e96468310d88abf247e582
 2013-02-28 16:43:23 -08:00
quddusc
ce7411f325 docs: Fixed onDestroy() code snippet in IABv3 training class. 
Bug: 8289494

Change-Id: I6f9dcd9e50ec8b03e8df415b6f7cee3221275c57
 2013-02-28 16:16:34 -08:00
Joe Malin
5d64aa2ac3 Bug 8289268: Reversed text Content Provider Basics 
Change-Id: I4eab50651d47bb86709740595d982d9524a561fb
 2013-02-28 09:18:24 -08:00
Dirk Dougherty
08a551b4ad am f132ac4f: am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit 'f132ac4fb4b0ca6cf3b8aaeea469a46a286435c7':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 19:00:16 -08:00
Dirk Dougherty
f132ac4fb4 am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit 'ac6a76d29f884e4229947a1d8d66315f61d32744':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 18:57:34 -08:00
Dirk Dougherty
ac6a76d29f am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit 'f19dd2b50ee64be29e034f2d5ca29ab5117ba27e':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 18:56:03 -08:00
Dirk Dougherty
f80cb1869e am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit '1c7b442aae47d34176f832a1c45393b9f7e42631':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-28 02:54:51 +00:00
Dirk Dougherty
f19dd2b50e am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit '1c7b442aae47d34176f832a1c45393b9f7e42631':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 18:54:18 -08:00
Dirk Dougherty
1c7b442aae Merge "Doc change: update 'multiple apks' criteria in filters doc." into jb-mr1-dev 2013-02-28 02:51:16 +00:00
Dirk Dougherty
c511675bcb Doc change: update 'multiple apks' criteria in filters doc. 
Change-Id: I8504f5e019758946d567d4391c1a875dead236c5
Bug: 8277558
 2013-02-28 02:50:11 +00:00
Scott Main
38471f9e85 am 49c03cc8: am 65b7d5a4: am dc9e84bd: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit '49c03cc8183f8a128f68ecf777cbe7ce9ac7d021':
  docs: add MTK usb driver info
 2013-02-27 17:35:30 -08:00
Scott Main
49c03cc818 am 65b7d5a4: am dc9e84bd: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit '65b7d5a4b39eee0ad184f5b81442786ff0fd06e9':
  docs: add MTK usb driver info
 2013-02-27 17:30:21 -08:00