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

146444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
4ed1d102fe am 3c359471: am 73433d3b: Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 
* commit '3c35947134affa9a8d30e29db5bcf6e217ead46f':
  Revert "Load the WebView Java code from an APK." DO NOT MERGE
 2014-07-28 20:32:53 +00:00
Yao Chen
5a02eef3e0 am 062dc86b: am 920a5b7b: Merge "s/thumbnail/icon in the browsing api." into lmp-dev 
* commit '062dc86b8d8364a6baa2e5a87816060cd60756fb':
  s/thumbnail/icon in the browsing api.
 2014-07-28 20:32:48 +00:00
Selim Gurun
5f6aaa8d2e am 73433d3b: Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 
* commit '73433d3b56e0b8f3803ed6747f00e22462fd6410':
  Revert "Load the WebView Java code from an APK." DO NOT MERGE
 2014-07-28 20:28:54 +00:00
Yao Chen
c49f36c9ee am 920a5b7b: Merge "s/thumbnail/icon in the browsing api." into lmp-dev 
* commit '920a5b7b1a3e9c19dcbe87c12d01659258e2805d':
  s/thumbnail/icon in the browsing api.
 2014-07-28 20:28:50 +00:00
Eino-Ville Talvala
5e14f94044 am a0a1c5cc: am c9e436f5: Camera2: CameraManager refurbishing and error management 
* commit 'a0a1c5cc09c5292556073c84c403fe18604c4a03':
  Camera2: CameraManager refurbishing and error management
 2014-07-28 20:28:28 +00:00
Eino-Ville Talvala
e291363137 am c9e436f5: Camera2: CameraManager refurbishing and error management 
* commit 'c9e436f543f1c793024a98a602894865869af808':
  Camera2: CameraManager refurbishing and error management
 2014-07-28 20:24:11 +00:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management 
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
 2014-07-28 20:21:12 +00:00
Alan Lau
ad7bcec1ee am f825484a: am c7888432: am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit 'f825484abc86d2ea8e47bddef903482a738e224d':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:20:20 +00:00
Bo Liu
9ea8fdeba7 am e211d641: am 7a286b09: Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 
* commit 'e211d641bf42bc571d3600cc0d2ef0963a6e4d28':
  Add WebView.enableSlowWholeDocumentDraw
 2014-07-28 20:20:15 +00:00
Alan Lau
8a5d7fa3c2 am c7888432: am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit 'c7888432e922de0801b088ec7a9335a01175524c':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:16:17 +00:00
Bo Liu
f2553b13cd am 7a286b09: Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 
* commit '7a286b0955c718db106de3cafb3741bf9a6e666a':
  Add WebView.enableSlowWholeDocumentDraw
 2014-07-28 20:16:12 +00:00
Alan Lau
a65633ac2b am cdfdcd3a: am 691b38c0: am d2e1ecb6: (-s ours) am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit 'cdfdcd3ac3aefaec8c01e90e617b92f9313fe416':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 20:11:57 +00:00
Alan Lau
b07cd7be57 am 0b78d5c0: am ed4d5218: am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit '0b78d5c0bc0cb841be9ddb711485d32f1cc88bbb':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 20:11:53 +00:00
Jorim Jaggi
b89837af94 am 3c8a2b13: am 98cbea21: Update alarm icon in status bar. 
* commit '3c8a2b13e2f45b0b775f7210f3394bb1fda388a9':
  Update alarm icon in status bar.
 2014-07-28 20:11:49 +00:00
Anish Athalye
94fd555eac am 6f08e0bf: am d39adfb5: am a665380b: (-s ours) am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '6f08e0bffbafa540019a2317e22c7d765b47795a':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 20:11:45 +00:00
Alan Lau
c9c70a830a am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '52baf3d096ae72de4264183d26465a90bba2550a':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:11:39 +00:00
Alan Lau
6a4018bc35 am 691b38c0: am d2e1ecb6: (-s ours) am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '691b38c0bacacbb9635a3a94f3fa64b40b87411c':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 20:07:46 +00:00
Alan Lau
68afa6ff0e am ed4d5218: am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'ed4d5218a94b7f14940301ceaafbf6e8fcd9bb83':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 20:07:42 +00:00
Jorim Jaggi
abbed0940a am 98cbea21: Update alarm icon in status bar. 
* commit '98cbea21760467d9f4b9f1d584ab0b0b232150b3':
  Update alarm icon in status bar.
 2014-07-28 20:07:36 +00:00
Anish Athalye
450fbf3805 am d39adfb5: am a665380b: (-s ours) am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit 'd39adfb5f785ebbdeb46f7b4c09b22ae83eb24fc':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 20:07:32 +00:00
George Mount
d1272165af am 36f1bef9: am 89f2152f: Make returning ActivityOptions part of ActivityRecord. 
* commit '36f1bef93987b404d0a871a5fbeff75d10043671':
  Make returning ActivityOptions part of ActivityRecord.
 2014-07-28 20:07:23 +00:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
38ff6a25c8 am d2e1ecb6: (-s ours) am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit 'd2e1ecb67bbb7fc5ae7f076ae5acec5d06a5c378':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 20:03:40 +00:00
Alan Lau
e7a11f9e40 am 18b5f44c: (-s ours) am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit '18b5f44c5eca22791c701d02bf7525c6bfd5aec3':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 20:03:37 +00:00
George Mount
d27cc30409 am 89f2152f: Make returning ActivityOptions part of ActivityRecord. 
* commit '89f2152fc4c7886fb9c420964ec98501131e6774':
  Make returning ActivityOptions part of ActivityRecord.
 2014-07-28 20:03:09 +00:00
Jorim Jaggi
02609c1d48 Update alarm icon in status bar. 
Now that we have new icons on Keyguard and QS, update it to the same
icon in status bar as well.

Change-Id: I87831a18b51719bb2b90b2198597ae20f61f8bb5
 2014-07-28 20:01:10 +00:00
Anish Athalye
761cf8010f am a665380b: (-s ours) am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit 'a665380b60de8900edca233848b556c123eb2e03':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:59:27 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00
George Mount
6ba042b514 Make returning ActivityOptions part of ActivityRecord. 
Bug 16626030

Getting the timing correct for when to clear returning activity options
was difficult when Activities can be destroyed and recreated. Moving
the returning ActivityOptions to the ActivityRecord forces the
ActivityOptions to only apply to the correct Activity.

Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e
 2014-07-28 19:56:09 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
44061f4847 am 332a478e: am fe27de2b: am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '332a478eeccb70587052e47919ff2c1f2b2dd870':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:29:38 +00:00
Anish Athalye
ef52ba664c am 612895da: am 2c4e4e1d: am c51a6e45: (-s ours) am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit '612895da7c6e2168be40c3c72288f038cfd45e20':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:29:34 +00:00
Jorim Jaggi
0a46327b63 am a111ed29: am 48189378: Clear all notifications improvements 
* commit 'a111ed29cf9f37f85cbb86aa778a62d98d38089f':
  Clear all notifications improvements
 2014-07-28 19:29:24 +00:00
Alan Lau
6b1e358cdb am fe27de2b: am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit 'fe27de2b07cdd4084ac2af5aeb898e3d5c126b71':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:22:04 +00:00
Anish Athalye
55e755c4c3 am 2c4e4e1d: am c51a6e45: (-s ours) am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit '2c4e4e1d8a7dd456f653a74f054f6c383d002a22':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:21:59 +00:00
Jorim Jaggi
2b2a8d4cf3 am 48189378: Clear all notifications improvements 
* commit '4818937806d0340513c8df50d6fcdcc7e417d4f9':
  Clear all notifications improvements
 2014-07-28 19:21:55 +00:00
Robert Greenwalt
8ba8c721b7 am 41c1e477: am 13c4ee0e: Merge "Remove dead code 1." into lmp-dev 
* commit '41c1e477fb2780a10f9b795cfb8b7a49cfa85ac9':
  Remove dead code 1.
 2014-07-28 19:20:11 +00:00
Alan Lau
c50ffa6783 am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '315037234206c500e73a15075b996122316ce9d8':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:16:08 +00:00
Anish Athalye
572619b1c2 am c51a6e45: (-s ours) am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'c51a6e45e857ee42d122e898590eb815e568564d':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:16:04 +00:00
Jorim Jaggi
4b04a3a164 Clear all notifications improvements 
- Fix a bug with visibility.
- Improve fling behavior such that the shade open animation still
  looks like that we are decelerating towards the last card.

Change-Id: I1ad167ce0001ff6850f49e819bab944943fa529d
 2014-07-28 19:13:35 +00:00
Robert Greenwalt
e9f04745fa am 13c4ee0e: Merge "Remove dead code 1." into lmp-dev 
* commit '13c4ee0ec60bbad4b3b18aab0be3f9b31fe2c84b':
  Remove dead code 1.
 2014-07-28 19:12:47 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Sreeram Ramachandran
0525e81043 am 05293dc8: am a62c7010: Prohibit address families by default unless a VPN explicitly allows them. 
* commit '05293dc8173b6567f7542d84b640984111ba4673':
  Prohibit address families by default unless a VPN explicitly allows them.
 2014-07-28 19:03:43 +00:00
Sreeram Ramachandran
ed0df24e4a am a62c7010: Prohibit address families by default unless a VPN explicitly allows them. 
* commit 'a62c7010b1971e797cedcd36a029e94f4b62ac55':
  Prohibit address families by default unless a VPN explicitly allows them.
 2014-07-28 18:58:37 +00:00
Zhijun He
e3fb2aa3b1 am 62279479: am 890a8285: ImageFormat: update raw10 spec to allow row padding 
* commit '622794791ac89fca4a52c6dc6ced19fa8aeebe5e':
  ImageFormat: update raw10 spec to allow row padding
 2014-07-28 18:54:40 +00:00