Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,190 Commits 3 Branches 0 Tags
d99db031ea0ff1fe93c924573f70eae8cd6f8edb
Commit Graph

45052 Commits

Author SHA1 Message Date
Adrian Roos
d99db031ea am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit 'b8d22d1c5bd035346832301e126ba83380bf63c0':
  Ensure that setting an empty password clears it
 2014-09-26 04:29:42 +00:00
Eino-Ville Talvala
6c4fb05931 am 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit '8127c2e702f84ccdb280a83b3dc2753684112506':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-26 04:29:38 +00:00
Michael Wright
2e4c96f879 am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '7d7668330efa99bdab44e8cc4d240ae0e05a0abb':
  Specify a device identifier for keyboard layout notification.
 2014-09-26 04:29:22 +00:00
Eino-Ville Talvala
7e349a54f3 am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '040b417fd85a6b99ff53e4805be17ffde5f6a3c6':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-26 00:25:41 +00:00
Ruben Brunk
33451859d8 am 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit '5e312018e6188deb665a9a19950bad176345708a':
  camera2: Fix null check in PictureCallback.
 2014-09-26 00:25:16 +00:00
Paul Lawrence
1d1ebd7f98 am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
  Fix pause when setting pin/pattern/password
 2014-09-26 00:23:53 +00:00
Chris Wren
ae208ba9ce am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '969cb2db770a44f1265dc57910edc3f58ae0fbbe':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-26 00:22:56 +00:00
Adrian Roos
f2be7170bf am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
  Ensure that setting an empty password clears it
 2014-09-25 22:56:39 +00:00
Eino-Ville Talvala
c043b87d48 am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-25 22:56:36 +00:00
Adrian Roos
dc1fc7fc77 am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it
 2014-09-25 22:47:25 +00:00
Eino-Ville Talvala
3517b1db4a am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-25 22:47:21 +00:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00
Michael Wright
b17ff6777d am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:38:38 +00:00
Eino-Ville Talvala
c2c520950a Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 2014-09-25 22:36:59 +00:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:27:05 +00:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
Eino-Ville Talvala
efdd0cc832 am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:45:33 +00:00
Eino-Ville Talvala
845ea54c51 am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:34:40 +00:00
Eino-Ville Talvala
52571b9032 Camera2 Legacy: Clear JPEG ids when reconfiguring. 
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.

Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
 2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13 Camera2 legacy: Improve robustness to camera service crashes 
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.

Bug: 17587496

Change-Id: I6757961e7c0387defd368a13cb7c343950602400
 2014-09-25 14:06:55 -07:00
Ruben Brunk
b4e87c1128 am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
  camera2: Fix null check in PictureCallback.
 2014-09-25 19:40:58 +00:00
Ruben Brunk
4b6b2104ac am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
  camera2: Fix null check in PictureCallback.
 2014-09-25 19:29:40 +00:00
Ruben Brunk
820a08a555 Merge "camera2: Fix null check in PictureCallback." into lmp-dev 2014-09-25 19:23:00 +00:00
Paul Lawrence
994ba63f89 am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:57:20 +00:00
Ruben Brunk
2c3d7c5f68 camera2: Fix null check in PictureCallback. 
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
 2014-09-25 11:48:27 -07:00
Paul Lawrence
809c1be06b am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:42:10 +00:00
Chris Wren
fa3f1232dd am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:41:24 +00:00
Paul Lawrence
3a5a0be61e Fix pause when setting pin/pattern/password 
Move setting encryption pin/pattern/password into a separate thread

Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
 2014-09-25 17:32:19 +00:00
Chris Wren
0a94bebf2e am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:29:25 +00:00
Chris Wren
b698185929 Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 2014-09-25 17:21:32 +00:00
John Reck
9bb49fe22d am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check 
* commit '4f6fa8433493221fc55a25aa9e958f4b188fe5a5':
  Missing null check
 2014-09-25 17:06:22 +00:00
Andre Eisenbach
114e82321b am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '05d8048883b25f0f65e689880221c7b5af9f7c52':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 17:05:59 +00:00
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
 2014-09-25 17:05:42 +00:00
John Reck
ca915dd6aa am 2994cc57: am e5831979: Missing null check 
* commit '2994cc57444cc0ae83081f2324a5ce94ab58965a':
  Missing null check
 2014-09-25 16:38:37 +00:00
Andre Eisenbach
b3e68eb21c am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '630f9671beae6a09e8a1fa315b632d292a83c4f0':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:38:19 +00:00
Jeff Sharkey
c1411a4253 am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'b8bbeff0796847bbe98deb2d84989b656356873c':
  Include reason when wiping data.
 2014-09-25 16:38:08 +00:00
Adrian Roos
ab7dae58cc Ensure that setting an empty password clears it 
Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
 2014-09-25 18:25:21 +02:00
John Reck
07b3c7428a am e5831979: Missing null check 
* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
  Missing null check
 2014-09-25 16:24:33 +00:00
Andre Eisenbach
9bb34605ce am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:22:45 +00:00
Jeff Sharkey
2649756975 am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-25 16:22:22 +00:00
John Reck
ccf2fa0031 Missing null check 
Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
 2014-09-25 08:33:05 -07:00
Ruben Brunk
ea06d48527 am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:24:12 +00:00
Ruben Brunk
fb444ce6f8 am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:03:40 +00:00
Ruben Brunk
1ac7646e8b am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 09:51:33 +00:00
Andre Eisenbach
77e7054176 Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 2014-09-24 23:57:02 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
Igor Murashkin
41882cd269 am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'c819ec1beee0d69ee956e77a57523596d17e3eb3':
  camera2: Increase preview frame timeout
 2014-09-24 22:54:24 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07:00
Igor Murashkin
fc4cba3619 am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
  camera2: Increase preview frame timeout
 2014-09-24 22:27:36 +00:00