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

148906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
8767a98367 am b026a7ca: am 1bf5f63f: am a56c39d8: Merge "camera2: (legacy) Support awb mode, test mode metadata keys" into lmp-dev 
* commit 'b026a7ca44811499a4bfa537a55d1c1a8e069923':
  camera2: (legacy) Support awb mode, test mode metadata keys
 2014-08-06 23:03:02 +00:00
ztenghui
3e33c1a67c am a963b7f4: am 195185c3: am 9b1aab53: End the animator when stop() is called 
* commit 'a963b7f4a7a0e1b9c5b789d1ce2757dafbc94d76':
  End the animator when stop() is called
 2014-08-06 23:02:52 +00:00
Chris Craik
342b9030ad am 9b8005f9: am 7e0669be: am 2fadca42: Move bitmap transforms out of bitmap ops 
* commit '9b8005f9378c9bf928805cf372ea9d4ddfdd2f56':
  Move bitmap transforms out of bitmap ops
 2014-08-06 23:02:26 +00:00
Mathieu Chartier
be06ed7832 am 69467a22: am 68a82532: am 53e75d31: Fix JNI error in exception reporting. 
* commit '69467a2201faf7d2078eb65a48f08f026ac8a96a':
  Fix JNI error in exception reporting.
 2014-08-06 23:02:22 +00:00
Mathieu Chartier
10cc103a6a am f2ed0bfc: am 021cf13e: am 7782c6b3: Merge "Fix JNI error in exception reporting." 
* commit 'f2ed0bfc94fa23b7b68b7e98c0fe650acc119b0b':
  Fix JNI error in exception reporting.
 2014-08-06 23:02:13 +00:00
John Reck
f4f98d46a7 am 2497aa2a: am ab8f7b75: am 80e1fc2e: Don\'t start RenderThread to do trimMemory 
* commit '2497aa2a02759b82cf59ede1e3865ce0ec699298':
  Don't start RenderThread to do trimMemory
 2014-08-06 23:01:49 +00:00
Eric Laurent
7627915d37 am 4026abd6: am be02ae58: am 56811fe9: Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev 
* commit '4026abd6161247c3ab635f3d66d82116dc4e4d64':
  AudioSystem: add API to query audio HW sync source
 2014-08-06 23:01:30 +00:00
Chet Haase
669eca2176 am c9ec035b: am 2622629f: am 9033d798: Fix Scroller interpolation 
* commit 'c9ec035b9291055db6fc6def5b1310274d192c2b':
  Fix Scroller interpolation
 2014-08-06 23:01:26 +00:00
Christopher Tate
9fa355d1aa am b7df7e7c: am 558715f6: am 92c30744: Add event logs for full backup/restore milestones 
* commit 'b7df7e7c5c493ff7912cbc9bc83f16248fcae36b':
  Add event logs for full backup/restore milestones
 2014-08-06 23:01:22 +00:00
Deepanshu Gupta
4e01c59e6c am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '6ebeefa04cb3c360d8028eb77e60bacf8a800cb1':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:59:08 +00:00
Deepanshu Gupta
6ebeefa04c am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '904d77118bab63139174470ef728ca9a53e75a15':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:51:47 +00:00
John Reck
ab0bee2d8d am baa3c95a: am 0196ea78: Add missing null check 
* commit 'baa3c95aa83b5212ca015203634034330ab1bf9b':
  Add missing null check
 2014-08-06 22:47:03 +00:00
Deepanshu Gupta
904d77118b am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '7b561be3a6fedebfce412cecd8c36d6686f6576c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:45:23 +00:00
John Reck
438e679f95 am 0196ea78: Add missing null check 
* commit '0196ea784c91b09352c3c542aa68b25aef9c319a':
  Add missing null check
 2014-08-06 22:41:57 +00:00
Deepanshu Gupta
7b561be3a6 am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:37:10 +00:00
Deepanshu Gupta
09c3c2edb2 am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:30:06 +00:00
John Reck
dc0349beba Add missing null check 
Bug: 16352267

Change-Id: Ib60baa6d22ec02ba623a297660e2e3ecc7557d0f
 2014-08-06 22:28:47 +00:00
Deepanshu Gupta
ba31d62862 am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:25:50 +00:00
Deepanshu Gupta
db94ea9ed0 am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201 am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:18:04 +00:00
ztenghui
9f16709cbd am d670d2e5: am fd5e64da: Merge "MiterLimit represent a ratio itself, no need to scale" into lmp-dev 
* commit 'd670d2e5d9fe494250f57ff40900f268920895ca':
  MiterLimit represent a ratio itself, no need to scale
 2014-08-06 22:13:51 +00:00
Deepanshu Gupta
79c3f678d2 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:09:13 +00:00
ztenghui
c2bb3b2217 am fd5e64da: Merge "MiterLimit represent a ratio itself, no need to scale" into lmp-dev 
* commit 'fd5e64da378f6293b34879eb951cd612bcc3dfae':
  MiterLimit represent a ratio itself, no need to scale
 2014-08-06 22:09:11 +00:00
Deepanshu Gupta
72cf03a27a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
  Fix SystemProperties in LayoutLib.
 2014-08-06 22:05:38 +00:00
Yao Chen
f1d541dbf2 am a35a9598: am d0b5fc4b: Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev 
* commit 'a35a9598d57152de99affd74eea871f3f2db6399':
  Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController
 2014-08-06 22:04:54 +00:00
Yao Chen
0ff54b04ab am d0b5fc4b: Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev 
* commit 'd0b5fc4b7842d6a1044b9d02780218de0d465530':
  Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController
 2014-08-06 22:01:12 +00:00
Deepanshu Gupta
3a544a81b3 resolved conflicts for merge of a232a68d to jb-mr1.1-docs 
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
 2014-08-06 15:00:14 -07:00
Paul Jensen
8043df68bf Merge "Flush DNS cache when routes change." into lmp-dev 2014-08-06 21:46:55 +00:00
Paul Jensen
5fb2c6ffe7 Flush DNS cache when routes change. 
We used to do this but the change got lost in the NetworkAgent
upgrade.  This brings it back.  ConnectivityService has netd do
the actual flushing.

bug:16549455
Change-Id: I11ddd55fcb9d1ed1d2c6a9be7eb8c57e41bdbdb8
 2014-08-06 22:39:40 -04:00
Adam Lesinski
14e15fe4ab Merge "Modify base Configuration used for aapt dump badging" into lmp-dev 2014-08-06 21:46:55 +00:00
Andrew Lee
a583066599 am 7850292f: am 630404d9: Merge ""Implement" formerly abstract methods VideoCallProvider." into lmp-dev 
* commit '7850292ff21572c290e0fc873806084bdd0cdde1':
  "Implement" formerly abstract methods VideoCallProvider.
 2014-08-06 21:45:38 +00:00
Igor Murashkin
bf0f512372 am 1bf5f63f: am a56c39d8: Merge "camera2: (legacy) Support awb mode, test mode metadata keys" into lmp-dev 
* commit '1bf5f63f3eda11ee0bb5280cf29a91d222c01a1c':
  camera2: (legacy) Support awb mode, test mode metadata keys
 2014-08-06 21:45:34 +00:00
Andrew Lee
aa0a2ebd41 am 630404d9: Merge ""Implement" formerly abstract methods VideoCallProvider." into lmp-dev 
* commit '630404d9f89006ee9c241e79f67a7c27c2ddb568':
  "Implement" formerly abstract methods VideoCallProvider.
 2014-08-06 21:41:58 +00:00
Igor Murashkin
b44d8e2dc8 am a56c39d8: Merge "camera2: (legacy) Support awb mode, test mode metadata keys" into lmp-dev 
* commit 'a56c39d891f9767297de2d4d3cbb56ecd9c8f06c':
  camera2: (legacy) Support awb mode, test mode metadata keys
 2014-08-06 21:41:54 +00:00
ztenghui
cedbbd190d am 195185c3: am 9b1aab53: End the animator when stop() is called 
* commit '195185c35be64097d6077448a56be296a054d7b8':
  End the animator when stop() is called
 2014-08-06 21:41:10 +00:00
Deepanshu Gupta
a232a68d4c resolved conflicts for merge of 5476cfee to jb-mr1-dev 
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
 2014-08-06 14:41:02 -07:00
ztenghui
6cdf292932 am 9b1aab53: End the animator when stop() is called 
* commit '9b1aab535e93cf3e6283e2d68184d9b516ae1bea':
  End the animator when stop() is called
 2014-08-06 21:36:53 +00:00
Deepanshu Gupta
5476cfee6b am 505c675c: Fix SystemProperties in LayoutLib. 
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
  Fix SystemProperties in LayoutLib.
 2014-08-06 21:28:24 +00:00
Chris Craik
d409d86e7a am 7e0669be: am 2fadca42: Move bitmap transforms out of bitmap ops 
* commit '7e0669bef09e35456ae3ddedf3814af732dec53f':
  Move bitmap transforms out of bitmap ops
 2014-08-06 21:26:08 +00:00
Mathieu Chartier
d004c1e31a am 68a82532: am 53e75d31: Fix JNI error in exception reporting. 
* commit '68a825328c537f294fb0f7a0a8715afdba449dc8':
  Fix JNI error in exception reporting.
 2014-08-06 21:26:04 +00:00
ztenghui
06eaf193bd End the animator when stop() is called 
bug:16830053

Change-Id: If27ba904b0f78ee8c59df3522a97f5f86509ca0e
 2014-08-06 21:23:08 +00:00
Chris Craik
ed3bda68cf am 2fadca42: Move bitmap transforms out of bitmap ops 
* commit '2fadca42aa58453339dc4cfadb9b412df4a5d2a5':
  Move bitmap transforms out of bitmap ops
 2014-08-06 21:21:39 +00:00
Mathieu Chartier
762d5de06f am 53e75d31: Fix JNI error in exception reporting. 
* commit '53e75d3115177f64ec2b3868f71e3f1356f1a55d':
  Fix JNI error in exception reporting.
 2014-08-06 21:21:35 +00:00
Barnaby James
cb18825357 Fix VoiceInteractionService.isActiveService. 
Small fix + added to the test application.

Change-Id: I05ad84c32064fc98d3bb90eff921702af9855a66
 2014-08-06 14:16:04 -07:00
Chris Craik
796475006f Move bitmap transforms out of bitmap ops 
bug:11359533

This allows us to deduplicate a lot between the two ops, and fixes the
shader coordinate space for the left,top argument drawBitmap to match
software.

Change-Id: I53da05af9ee74c74e9e70b4ab8053190ca220b16
 2014-08-06 21:11:31 +00:00
Mathieu Chartier
177b187cc6 am 021cf13e: am 7782c6b3: Merge "Fix JNI error in exception reporting." 
* commit '021cf13e7abfb2fcf1bddf957d23ef1eda2ca191':
  Fix JNI error in exception reporting.
 2014-08-06 21:09:58 +00:00
Mathieu Chartier
021cf13e7a am 7782c6b3: Merge "Fix JNI error in exception reporting." 
* commit '7782c6b381ce862cd4e4f7c986e1b7a0bb7ddaa9':
  Fix JNI error in exception reporting.
 2014-08-06 21:04:44 +00:00
Mathieu Chartier
d1a7fca145 Fix JNI error in exception reporting. 
There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627

(cherry picked from commit cf6775eece8628ac069a6d4803e7f20a017e7e62)

Change-Id: Ibdc7d0e55a48b2a61a1db0868a5d77c2ae53f6f3
 2014-08-06 14:01:09 -07:00
John Reck
704452d732 am ab8f7b75: am 80e1fc2e: Don\'t start RenderThread to do trimMemory 
* commit 'ab8f7b7566acc4b04ea96df975c69cb8320fc3c5':
  Don't start RenderThread to do trimMemory
 2014-08-06 20:54:17 +00:00