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

168610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
515b3b9c27 am edc2c734: am 15803d4a: am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit 'edc2c734b08303b264c97f61bf793e01c567f21c':
  Add a constant for invalid profile id value
 2014-10-20 22:31:40 +00:00
Amit Mahajan
edc2c734b0 am 15803d4a: am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit '15803d4ace0e996295e74a04da2aafd550c7737c':
  Add a constant for invalid profile id value
 2014-10-20 22:27:51 +00:00
Amit Mahajan
15803d4ace am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit '1213bf83e96bf9a3747a90d84969038b9ad76971':
  Add a constant for invalid profile id value
 2014-10-20 22:21:26 +00:00
Amit Mahajan
1213bf83e9 Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 2014-10-20 22:17:39 +00:00
Dan Albert
39e50a686a am 11d3d101: am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '11d3d1016bf7064f0232278eb0a798dfb33ab00f':
  Fix an overflow found by ASAN.
 2014-10-20 22:05:28 +00:00
Dan Albert
11d3d1016b am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.
 2014-10-20 22:01:04 +00:00
Griff Hazen
331d916377 am 22cf0183: am 22b1113e: am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit '22cf018313fd2b427c16002a5a14354342b6075e':
  Disable zen log printouts by default
 2014-10-20 22:00:16 +00:00
Wei Wang
c071e2775f am a4f81468: am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit 'a4f814682ff30a19ba80555bdc809d14bdb24bca':
  Remove spammy log information for BLE scan.
 2014-10-20 22:00:12 +00:00
smain@google.com
0249f46d4e am fcbebd50: am 8f481f4f: am 3f256d52: am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit 'fcbebd50fe80891d8745c84fc3052242320f6540':
  Doc change: misc changes to highlights.
 2014-10-20 22:00:09 +00:00
Griff Hazen
22cf018313 am 22b1113e: am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit '22b1113e0b4ecbf0b2660d642e6cd489c058d76d':
  Disable zen log printouts by default
 2014-10-20 21:55:04 +00:00
Wei Wang
a4f814682f am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '1217c2b2dbe7b4273a7c08ac55b417270ee20b78':
  Remove spammy log information for BLE scan.
 2014-10-20 21:54:59 +00:00
smain@google.com
fcbebd50fe am 8f481f4f: am 3f256d52: am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit '8f481f4fdb7e288ffb8c900071487b5908a3ce20':
  Doc change: misc changes to highlights.
 2014-10-20 21:54:54 +00:00
Dan Albert
9295a1354e am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit 'e40974d92873462c4f1b100c7d03b3f41756c807':
  Fix an overflow found by ASAN.
 2014-10-20 21:54:41 +00:00
Griff Hazen
22b1113e0b am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit '6e1eb1c96680ee9b51ca3f6a4ebd29711cfb5927':
  Disable zen log printouts by default
 2014-10-20 21:50:02 +00:00
Wei Wang
1217c2b2db am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '2959231c78fb890907e4dc6cf232f1d64ef37bcf':
  Remove spammy log information for BLE scan.
 2014-10-20 21:49:58 +00:00
smain@google.com
8f481f4fdb am 3f256d52: am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit '3f256d52952630887bfa04c8cef44a099b8a2615':
  Doc change: misc changes to highlights.
 2014-10-20 21:49:53 +00:00
Dan Albert
e40974d928 Merge "Fix an overflow found by ASAN." 2014-10-20 21:48:44 +00:00
Griff Hazen
6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default
 2014-10-20 21:46:12 +00:00
Wei Wang
2959231c78 am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
  Remove spammy log information for BLE scan.
 2014-10-20 21:46:08 +00:00
smain@google.com
3f256d5295 am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit 'ae6dc92c3d39862e97a778ea69943ee37a78e92b':
  Doc change: misc changes to highlights.
 2014-10-20 21:46:00 +00:00
Dan Albert
d395f79133 Fix an overflow found by ASAN. 
Sometimes len is 0.

Change-Id: I031000188edc57663a5519b00cbbb751600d32f4
 2014-10-20 14:45:55 -07:00
Griff Hazen
aec92e2eca Merge "Disable zen log printouts by default" into lmp-sprout-dev 2014-10-20 21:43:16 +00:00
Wink Saville
be11d12462 am f9bec04d: am f4d86a1d: am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit 'f9bec04d89ce6270d71b738be341f3e443abcce5':
  Radio Capability Support.
 2014-10-20 21:42:28 +00:00
Wei Wang
33bb6c2d3c Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 2014-10-20 21:41:29 +00:00
smain@google.com
ae6dc92c3d am 21de5f3f: Doc change: misc changes to highlights. 
* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
  Doc change: misc changes to highlights.
 2014-10-20 21:40:11 +00:00
Wink Saville
f9bec04d89 am f4d86a1d: am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit 'f4d86a1dd9d758f9479a7d486e610930266205d0':
  Radio Capability Support.
 2014-10-20 21:34:37 +00:00
smain@google.com
21de5f3f12 Doc change: misc changes to highlights. 
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
 2014-10-20 14:34:22 -07:00
Wink Saville
f4d86a1dd9 am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit 'f44628e3133a6bffd225836b1fff23cd827938a7':
  Radio Capability Support.
 2014-10-20 21:29:29 +00:00
Wink Saville
f44628e313 am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
  Radio Capability Support.
 2014-10-20 21:24:27 +00:00
Adam Lesinski
96aef34f74 am 217b17a9: am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '217b17a915849ac50f01f9097e0e35e2b21e6235':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:21:21 +00:00
Wink Saville
6bacccbfbc Merge "Radio Capability Support." into lmp-sprout-dev 2014-10-20 21:17:29 +00:00
Adam Lesinski
217b17a915 am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit 'd3969d927eef2f04ec097244c5f2bff5e7c0689e':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:16:17 +00:00
Adam Lesinski
d3969d927e am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:10:09 +00:00
Adam Lesinski
6dfe03ae6c am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:05:04 +00:00
ztenghui
f164f2bca6 am 9aa6ea10: am 8c857eec: am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '9aa6ea106d7aec78e5ea4ea251c1eac146496fa6':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 21:04:42 +00:00
Griff Hazen
1aad144c8f Disable zen log printouts by default 
Bug: 18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
 2014-10-20 14:02:59 -07:00
Adam Lesinski
73a8c5962d am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:00:23 +00:00
Derek Sollenberger
1383d1e60f Remove error case 
bug: 18051326
Change-Id: I4f2f4abf80b89e540a91251ce55cd65375f6ca65
 2014-10-20 16:59:27 -04:00
Derek Sollenberger
69f8f8013c Merge "Add back include that ensures RENDER_TEXT_AS_GLYPHS is set consistently." 2014-10-20 20:56:37 +00:00
ztenghui
9aa6ea106d am 8c857eec: am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '8c857eec746307dfeb8acb6b080ecc2aa8476ece':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:56:09 +00:00
Adam Lesinski
3f8c7dec6b Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 2014-10-20 20:55:48 +00:00
ztenghui
8c857eec74 am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '12d808a24f4af9a127ae851edd06339b77020178':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:48:05 +00:00
ztenghui
12d808a24f am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit 'a724d1ab4083f08958bd88e76e15b7c0af337bfc':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:42:51 +00:00
ztenghui
a724d1ab40 am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:35:58 +00:00
John Spurlock
8d0426e59a am 6cae74a8: am c8a01f35: am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit '6cae74a800f5350e470862144fc307faa648d730':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:30:03 +00:00
ztenghui
877ce2c42b Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev 2014-10-20 20:29:17 +00:00
Derek Sollenberger
5865172542 Add back include that ensures RENDER_TEXT_AS_GLYPHS is set consistently. 
bug: 18051326
Change-Id: I1ee9f8acb25fb1684e156c61e2cf2669d15a99cb
 2014-10-20 16:26:24 -04:00
John Spurlock
6cae74a800 am c8a01f35: am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit 'c8a01f353e957ee26d9f5624f32df6005ed03f21':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:25:20 +00:00
John Spurlock
c8a01f353e am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit '3babc728e0910ac25744bdf3f923fdfdeeb689d1':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:20:25 +00:00
John Spurlock
3babc728e0 Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 2014-10-20 20:15:38 +00:00