Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,322 Commits 3 Branches 0 Tags
ca38911533a538d74bcd5adbe1b009a0ccdf203f
Commit Graph

45996 Commits

Author SHA1 Message Date
Paul Lawrence
ca38911533 am 342d9c5f: am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '342d9c5f8f79b3189e803b19a148da9e6bd5c44a':
  Fix pause when setting pin/pattern/password
 2014-09-26 15:26:05 +00:00
Chris Wren
60772b487d am 18fc9f40: am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '18fc9f40a61e90feb6154702db91cd25c4a4f752':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-26 15:25:37 +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
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
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
1ffaabc4c9 am f04bc7e4: am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check 
* commit 'f04bc7e4892bc6be7cc40f5525f5ddd037ec74b8':
  Missing null check
 2014-09-25 17:19:09 +00:00
Andre Eisenbach
196abec5e9 am 8ba97cf8: am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '8ba97cf8845e31103dbf14a7072760f5275b71ab':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 17:18:45 +00:00
Jeff Sharkey
c894355d7e am d46c9385: am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd46c93852393569e3211fc7bada91e712634572e':
  Include reason when wiping data.
 2014-09-25 17:18:31 +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
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
4656e6bb16 am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:35:00 +00: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
9c5b1ffcd7 am 437a7488: am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit '437a7488196e7935bb4547f095e900db156b844e':
  camera2: Increase preview frame timeout
 2014-09-24 23:03:13 +00:00
Andreas Gampe
4d64addc20 am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
* commit '43d0256429c46a1243c8d85a34d029b40fd5e34e':
  Frameworks/base: Early init native bridge
 2014-09-24 23:02:38 +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
Chris Wren
957ed70273 getCurrentInterruptionFilter should return the filter value, not the hints. 
Bug: 17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
 2014-09-24 18:17:36 -04:00
Prerepa Viswanadham
f0b56a5a7f Remove remanents of onConnectionCongested in framwork 
Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
 2014-09-24 22:15:08 +00:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge" 
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
 2014-09-24 22:10:15 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
Igor Murashkin
c4b7919882 am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
  camera2: Increase preview frame timeout
 2014-09-24 21:07:24 +00:00
Igor Murashkin
1dbf7248ea Merge "camera2: Increase preview frame timeout" into lmp-dev 2014-09-24 20:58:18 +00:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
 2014-09-24 13:58:09 -07:00
George Mount
2755745a9e am 0a55edde: am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '0a55eddeaec857c408c6a5ada58d8aeb70e1f4da':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:57:21 +00:00
Igor Murashkin
3e2c14f3d6 camera2: Increase preview frame timeout 
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.

Increase the timeout to make it significantly less likely to get frame drops.

Bug: 17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
 2014-09-24 13:53:40 -07:00
George Mount
da083bfd03 am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '028332e93e885d260c6214ca14e02035242c8dfe':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:49:33 +00:00
George Mount
c9a5227292 Fix NPE when detached View is added as a shared element. 
Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
 2014-09-24 12:39:08 -07:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers. 
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
 2014-09-24 10:43:12 -07:00
Svetoslav
cbed9891b0 am 2324d352: am 0444464b: am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev 
* commit '2324d3522f9dee5c47c7d64974118fd4760a2bd4':
  Ignore not visible  views computing click point for accessibility.
 2014-09-24 17:18:55 +00:00
Zoltan Szatmary-Ban
e1fe008b5a am 2ee27770: am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 
* commit '2ee27770fac1bd74f88ab80a1b2b962489c4f52a':
  Register ActivityManagerService.PackageMonitor for all users.
 2014-09-24 17:18:42 +00:00
Lorenzo Colitti
9058c3c926 am c5df869d: am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 
* commit 'c5df869d84533d79242b06f4d06ea8250158963d':
  Block address families with routes, not NetworkAgent side channel
 2014-09-24 17:17:51 +00:00