Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,340 Commits 3 Branches 0 Tags
2706cb804a4e2d52b671a560f65108cf2ebbcd6d
Commit Graph

175340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
2706cb804a am 24a9ddde: am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit '24a9ddde72262312d03fe733855660f2e61947b2':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-26 18:10:09 +00:00
Roozbeh Pournader
983cb42cab am 77bcf296: am 779c8ad6: am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit '77bcf2962bc0eb1c0ee3bd232931bcb1198f120e':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-26 18:10:04 +00:00
Eric Laurent
24a9ddde72 am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit '297222315e90021497eee4ef6014f463fab96c6a':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-26 18:01:04 +00:00
Roozbeh Pournader
77bcf2962b am 779c8ad6: am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit '779c8ad67957d0b0c0851226c2ed96df418037ae':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-26 18:00:59 +00:00
dcashman
9fd6d9d995 Merge "Remove if(true) line." 2014-11-26 17:23:01 +00:00
dcashman
0e0dbf9367 Merge "Prevent EntropyMixer from registering with service manager." 2014-11-26 17:17:00 +00:00
dcashman
4e3f5d3fe4 Remove if(true) line. 
Commit: e4d9a01bfc introduced an
if (true) block with the intention of changing it.  Remove it.

Change-Id: Ida637cb69c57b7b676f37a3397d72e0bf010523a
 2014-11-26 09:06:57 -08:00
Geoff Mendal
e2d619b663 Merge "Import translations. DO NOT MERGE" 2014-11-26 15:12:02 +00:00
Geoff Mendal
8d08e39018 Import translations. DO NOT MERGE 
Change-Id: I281db36394df99897f90cbf5c460cc141a4af569
Auto-generated-cl: translation import
 2014-11-26 07:09:05 -08:00
Geoff Mendal
19475c24a9 Import translations. DO NOT MERGE 
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
 2014-11-26 06:39:40 -08:00
Lajos Molnar
fdc9e9de08 am d4604b4f: am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit 'd4604b4fd370fa54d94ec94e6137b093f9f3da8c':
  media: add support for 160-byte image info in MediaCodec
 2014-11-26 12:09:56 +00:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
John Reck
e39f788950 am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:09:42 +00:00
Jorim Jaggi
2edf7d6065 am 2f47df83: am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit '2f47df83343e51214c792dc89874f0bccbeb4593':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:09:37 +00:00
Robin Lee
e07f2c01af am a7ffed86: am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'a7ffed86fce0a0cab8915bd6a727605959f08bb7':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:09:33 +00:00
Chris Craik
3c96a2b8fe am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
  Improve DisplayList state output
 2014-11-26 12:09:28 +00:00
Dianne Hackborn
6a2acff8c1 am 6df037ac: am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit '6df037ac5d2b4b6f027ca36284ee09ed10970cd8':
  Start MountService before performBootDexOpt
 2014-11-26 12:09:24 +00:00
John Spurlock
97abe5040a am a2decb0e: am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'a2decb0e4d50c68391b82e7acf6c425df2f30dd6':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:09:18 +00:00
Lajos Molnar
d4604b4fd3 am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit 'c60a5d781a5e9f927d5971f2127cada9d213a128':
  media: add support for 160-byte image info in MediaCodec
 2014-11-26 12:02:50 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:02:28 +00:00
John Reck
0d4ab958c1 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:02:19 +00:00
Jorim Jaggi
2f47df8334 am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'dccd3662da356ed7b0beedc09c8a58103723b463':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:02:13 +00:00
Robin Lee
a7ffed86fc am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'cc19e8b85b223e8a4b36ce3342c28f250fb08f91':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:02:06 +00:00
Chris Craik
1fb141f83b am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '9c5b7b094254cad0a8a90ece5ea650c49694087d':
  Improve DisplayList state output
 2014-11-26 12:01:46 +00:00
Dianne Hackborn
6df037ac5d am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit 'bafddb4aa57b79f51c0b1f5d4f4cf178069b824c':
  Start MountService before performBootDexOpt
 2014-11-26 12:01:41 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:01:35 +00:00
Narayan Kamath
0acb606df5 am c9269da2: am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'c9269da26cad88cc4d2fd84607e5245b19b29067':
  Start MountService before performBootDexOpt
 2014-11-26 11:17:25 +00:00
Narayan Kamath
c9269da26c am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'edda97c9ffc4fae08744e42fdbf60040e8f97b99':
  Start MountService before performBootDexOpt
 2014-11-26 11:10:48 +00:00
Narayan Kamath
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
 2014-11-26 11:05:46 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
Scott Main
f24f2d9453 Merge "docs:download updates for studio" 2014-11-26 03:14:36 +00:00
Chris Craik
47414be761 am ab1a53c5: am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'ab1a53c509edbc8bacd944233335587dffd95999':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:14:29 +00:00
Chris Craik
ab1a53c509 am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:08:05 +00:00
Chris Craik
bf62d3070c am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:02:17 +00:00
Chris Craik
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00
Elliott Hughes
1f7b3b5c7d am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit '1fae0991326fbaac8a11ae972f0da2bbc50be429':
  We have POSIX clocks.
 2014-11-25 23:35:47 +00:00
Elliott Hughes
1fae099132 am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit 'f67cc149982cefdcf9f8697c9966c710f6512d23':
  We have POSIX clocks.
 2014-11-25 23:29:14 +00:00
Elliott Hughes
f67cc14998 am 2657717f: Merge "We have POSIX clocks." 
* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.
 2014-11-25 23:23:45 +00:00
Elliott Hughes
2657717f97 Merge "We have POSIX clocks." 2014-11-25 23:17:59 +00:00
Elliott Hughes
42c569224a We have POSIX clocks. 
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
 2014-11-25 15:11:59 -08:00
Eric Laurent
297222315e am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit 'e511ddce43ce3586f9bced5f8505e540951ab524':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-25 22:33:03 +00:00
Roozbeh Pournader
779c8ad679 am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit 'c08b47a7acf0192bb24d7d189345840f1c5258cc':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-25 22:32:58 +00:00
Eric Laurent
e511ddce43 Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 2014-11-25 22:28:17 +00:00
Roozbeh Pournader
c08b47a7ac Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 2014-11-25 22:27:40 +00:00
Lajos Molnar
c60a5d781a am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit '3ed95fe2589c01e9255f4d75636fb8b0c83a01d5':
  media: add support for 160-byte image info in MediaCodec
 2014-11-25 22:15:11 +00:00
Lajos Molnar
3ed95fe258 Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 2014-11-25 22:09:36 +00:00
Paul Crowley
ba94fd5e6c am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '77e25331ca7ad1fb69fbe7fbec69179824e46e59':
  Add flag for wiping factory reset protection data.
 2014-11-25 21:18:30 +00:00
Paul Crowley
77e25331ca Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 2014-11-25 21:13:30 +00:00