OSDN Git Service
Alan Newberger [Mon, 27 Oct 2014 05:36:08 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:06 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:05 +0000 (05:36 +0000)]
am
2d4b0949: (-s ours) am
d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"
* commit '
2d4b0949cf60ec96162bb3436df35db61abd6e09':
Baligh Uddin [Mon, 27 Oct 2014 04:21:37 +0000 (04:21 +0000)]
am
8929aecc: (-s ours) am
41a13974: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
8929aeccd3772d9a4cf1a1ddbd91562952638825':
Jiawen Chen [Mon, 27 Oct 2014 04:21:35 +0000 (04:21 +0000)]
am
0a9e31f5: am
6dfb91e0: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
0a9e31f5bfd4bf4044f090b209c8fbf39356cee7':
Alan Newberger [Mon, 27 Oct 2014 04:21:33 +0000 (04:21 +0000)]
am
04408f74: am
2aa7189d: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
04408f74cee92e6712d548ce10561562f4e5248d':
Spike Sprague [Mon, 27 Oct 2014 04:21:32 +0000 (04:21 +0000)]
am
9e6b902f: am
11c70fb3: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
9e6b902fcb0b350159fd3dfd3eea9f481cb6ef07':
Spike Sprague [Mon, 27 Oct 2014 04:21:30 +0000 (04:21 +0000)]
am
037e25a6: am
f608095c: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
037e25a68613cc95add0e8da3f39f820ddee4ab8':
Spike Sprague [Mon, 27 Oct 2014 04:21:28 +0000 (04:21 +0000)]
am
0d9b4776: am
0f44eb07: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
0d9b4776f5300bf451533df628cde15c4d826565':
Spike Sprague [Mon, 27 Oct 2014 04:21:26 +0000 (04:21 +0000)]
Baligh Uddin [Mon, 27 Oct 2014 04:21:24 +0000 (04:21 +0000)]
am
6eba7685: (-s ours) am
3cb0aab3: (-s ours) am
9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6eba768550a5fe7c3dba506bdaf19c6de83b3819':
Puneet Lall [Mon, 27 Oct 2014 04:21:22 +0000 (04:21 +0000)]
am
38827648: am
a82d6ce2: am
0d7a8c08: am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
38827648c2fae431b106c8845bfb7be49d67ecab':
Spike Sprague [Mon, 27 Oct 2014 04:21:20 +0000 (04:21 +0000)]
am
023a45e8: am
22173edc: am
ad1462a9: am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
023a45e82a1cf7486d7a142308f27b5683b9c238':
Senpo Hu [Fri, 24 Oct 2014 21:34:35 +0000 (21:34 +0000)]
am
1c5f87e4: am
8fb9e06b: Adopt the new error handling mechanism in portability.
* commit '
1c5f87e4b6a5d2c7c25449fd84f09c999e1046dd':
Adopt the new error handling mechanism in portability.
Senpo Hu [Fri, 24 Oct 2014 20:12:49 +0000 (20:12 +0000)]
am
8fb9e06b: Adopt the new error handling mechanism in portability.
* commit '
8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25':
Adopt the new error handling mechanism in portability.
Senpo Hu [Tue, 7 Oct 2014 01:35:44 +0000 (18:35 -0700)]
Adopt the new error handling mechanism in portability.
Show camera fatal dialog to guide users exiting the app when
1) camera framework throws RTE or
2) DispatchThread job is timeout.
If users hit home button while error dialog is shown, just exit
the app.
Bug:
16189216
Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65
Conflicts:
src/com/android/camera/CameraActivity.java
Baligh Uddin [Sun, 19 Oct 2014 22:34:59 +0000 (22:34 +0000)]
am
5e4a50d3: (-s ours) am
0d283729: (-s ours) am
9d87600a: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
5e4a50d3bf220af8c8e5170ef0e0115595c582d6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:28:29 +0000 (22:28 +0000)]
am
0d283729: (-s ours) am
9d87600a: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
0d283729f3cb0bdc3f5afd992e5f49e56d1e5728':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:23:46 +0000 (22:23 +0000)]
am
9d87600a: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
9d87600a24c9b9b1c7a1d85b46971dba51d48e2c':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:17:06 +0000 (22:17 +0000)]
am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
91bceebd0bb15a5d20d43f8eca808114b96eb5ce':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:43:09 +0000 (13:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9aa9830e9e60b0a774c9001f6cd5bb48f7c7d0cd
Auto-generated-cl: translation import
Neil Fuller [Fri, 17 Oct 2014 15:30:05 +0000 (16:30 +0100)]
resolved conflicts for merge of
c0dd3adf to lmp-mr1-dev-plus-aosp
Change-Id: I48ff6962b8b24f6b9714a660e706b35336a99a06
Neil Fuller [Fri, 17 Oct 2014 15:14:57 +0000 (15:14 +0000)]
Merge "Remove dependencies on FloatMath"
Dianne Hackborn [Fri, 10 Oct 2014 17:15:11 +0000 (17:15 +0000)]
am
d0501b04: am
55157d27: am
cc933608: am
2d440350: Update to use real L codename.
* commit '
d0501b049bd9b979fdef671df2e3115b7403bb34':
Update to use real L codename.
Dianne Hackborn [Fri, 10 Oct 2014 00:41:37 +0000 (00:41 +0000)]
am
55157d27: am
cc933608: am
2d440350: Update to use real L codename.
* commit '
55157d27305d06569f0bd7d3c47ec51855f87da4':
Update to use real L codename.
Dianne Hackborn [Fri, 10 Oct 2014 00:30:45 +0000 (00:30 +0000)]
am
cc933608: am
2d440350: Update to use real L codename.
* commit '
cc93360812c822eb4cac8056a0848c74338b3776':
Update to use real L codename.
Dianne Hackborn [Thu, 9 Oct 2014 19:29:30 +0000 (19:29 +0000)]
am
2d440350: Update to use real L codename.
* commit '
2d4403500d0bb55794aecbe9a33a03dd09f8ea0a':
Update to use real L codename.
Dianne Hackborn [Wed, 8 Oct 2014 16:37:44 +0000 (09:37 -0700)]
Update to use real L codename.
Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
Alan Newberger [Tue, 7 Oct 2014 00:55:26 +0000 (00:55 +0000)]
am
017050a5: am
d014ce87: am
49123263: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
017050a539676b08da5df0e478d706b04ff081e2':
Fix preference copy migration and incorrect HDR+ sticky bit
Alan Newberger [Tue, 7 Oct 2014 00:34:26 +0000 (00:34 +0000)]
am
d014ce87: am
49123263: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
d014ce874af7d21e527213d65070af17905ecf36':
Fix preference copy migration and incorrect HDR+ sticky bit
Alan Newberger [Tue, 7 Oct 2014 00:20:29 +0000 (00:20 +0000)]
am
49123263: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
4912326305fbd05fe7ceff82aa2d2ecbd9f3127a':
Fix preference copy migration and incorrect HDR+ sticky bit
Alan Newberger [Tue, 7 Oct 2014 00:13:23 +0000 (00:13 +0000)]
am
ca29a477: am
f4c28525: am
0424d264: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
ca29a477126fb0c849155cce3c998f8c4f44fe4c':
Fix incorrect key translation in Settings refactor
Alan Newberger [Tue, 7 Oct 2014 00:05:33 +0000 (00:05 +0000)]
am
f4c28525: am
0424d264: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
f4c28525f56c34d0659d6b0657fc15289814905d':
Fix incorrect key translation in Settings refactor
Alan Newberger [Mon, 6 Oct 2014 23:52:35 +0000 (23:52 +0000)]
am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
7ba23fed935fa796c9c76b16c9bae79bf3f8b969':
Fix preference copy migration and incorrect HDR+ sticky bit
Alan Newberger [Mon, 6 Oct 2014 23:51:09 +0000 (23:51 +0000)]
am
0424d264: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
0424d26413389555335ac941de632a1afa1485b7':
Fix incorrect key translation in Settings refactor
Alan Newberger [Mon, 6 Oct 2014 22:35:20 +0000 (22:35 +0000)]
am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
0ac0b733d510fc17d072c61055c0e2ad446689ff':
Fix incorrect key translation in Settings refactor
Alan Newberger [Mon, 6 Oct 2014 15:54:09 +0000 (08:54 -0700)]
Fix preference copy migration and incorrect HDR+ sticky bit
A sticky bit upgrader particularly for HDR+ was looking in
globals but was actually a module setting. The copy migrator
was not properly handling booleans! Modified the copy migrator
to properly handle supported types and removed the custom
incorrect upgrader.
Bug:
17875895
Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
(cherry picked from commit
90672aa08379e598426c12b529a86afd4b61011e)
Alan Newberger [Mon, 6 Oct 2014 21:20:50 +0000 (21:20 +0000)]
Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
Alan Newberger [Sun, 5 Oct 2014 19:16:22 +0000 (19:16 +0000)]
am
2101ab4b: am
b1a810b2: am
c6dfd609: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
2101ab4b214a2a92ee32ce42d799192e46e71ea4':
Trap CameraAgentFactory RTEs during recycle
Alan Newberger [Sun, 5 Oct 2014 19:16:21 +0000 (19:16 +0000)]
am
450cef14: am
ead83e3e: am
57177a77: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
450cef14657b876fa30d9c31cf35e1ce80611cde':
Trap camera close exceptions on pause
Alan Newberger [Sun, 5 Oct 2014 19:11:31 +0000 (19:11 +0000)]
am
b1a810b2: am
c6dfd609: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
b1a810b21391ff37db16e08f705bb968142ac146':
Trap CameraAgentFactory RTEs during recycle
Alan Newberger [Sun, 5 Oct 2014 19:11:30 +0000 (19:11 +0000)]
am
ead83e3e: am
57177a77: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
ead83e3eeb6c28944afe59594a90a99c75bf2daf':
Trap camera close exceptions on pause
Alan Newberger [Sun, 5 Oct 2014 19:06:52 +0000 (19:06 +0000)]
am
c6dfd609: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
c6dfd6093850f93cd54987c6ec3613a80b2bf641':
Trap CameraAgentFactory RTEs during recycle
Alan Newberger [Sun, 5 Oct 2014 19:06:52 +0000 (19:06 +0000)]
am
57177a77: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
57177a77c9c872779ef93332f53958c82634381d':
Trap camera close exceptions on pause
Alan Newberger [Sun, 5 Oct 2014 19:02:50 +0000 (19:02 +0000)]
am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
d30fdee360db38e93e4639bd1c28049d0b6b09e0':
Trap CameraAgentFactory RTEs during recycle
Alan Newberger [Sun, 5 Oct 2014 19:02:49 +0000 (19:02 +0000)]
am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
b0be8f5321605380110ca03a3ae6880b042fe187':
Trap camera close exceptions on pause
Alan Newberger [Sun, 5 Oct 2014 18:57:27 +0000 (18:57 +0000)]
Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
Alan Newberger [Sun, 5 Oct 2014 18:57:08 +0000 (18:57 +0000)]
Merge "Trap camera close exceptions on pause" into lmp-dev
Alan Newberger [Sun, 5 Oct 2014 14:04:17 +0000 (14:04 +0000)]
am
f1d421a6: am
833c7cbe: am
ce06a319: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
f1d421a6e2d319068c74b983954e0a57951b1c07':
Avoid porting null keys when copying preferences into new system
Alan Newberger [Sun, 5 Oct 2014 14:04:17 +0000 (14:04 +0000)]
am
82ee8abb: am
cea8512a: am
d0590b34: am
a9ed2418: Only set preview size before starting preview
* commit '
82ee8abb56494966d2bf03c064ec1c2c05dfa5e1':
Only set preview size before starting preview
Alan Newberger [Sun, 5 Oct 2014 13:58:56 +0000 (13:58 +0000)]
am
833c7cbe: am
ce06a319: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
833c7cbe3aabf49d95c504e5e6503e0436225859':
Avoid porting null keys when copying preferences into new system
Alan Newberger [Sun, 5 Oct 2014 13:58:55 +0000 (13:58 +0000)]
am
cea8512a: am
d0590b34: am
a9ed2418: Only set preview size before starting preview
* commit '
cea8512a91fb033aca5aceecc326e78658054fef':
Only set preview size before starting preview
Alan Newberger [Sun, 5 Oct 2014 12:47:49 +0000 (12:47 +0000)]
am
ce06a319: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
ce06a31953255060dded6a60acaa32f1dd203751':
Avoid porting null keys when copying preferences into new system
Alan Newberger [Sun, 5 Oct 2014 12:47:48 +0000 (12:47 +0000)]
am
d0590b34: am
a9ed2418: Only set preview size before starting preview
* commit '
d0590b34b9ab925ece8b9473757c83e8691d4da5':
Only set preview size before starting preview
Alan Newberger [Sun, 5 Oct 2014 12:05:06 +0000 (12:05 +0000)]
am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
0021c30190af49119ee319af6b207643b417c6c3':
Avoid porting null keys when copying preferences into new system
Alan Newberger [Sun, 5 Oct 2014 12:05:05 +0000 (12:05 +0000)]
am
a9ed2418: Only set preview size before starting preview
* commit '
a9ed2418a9d52d07bcbddfbb1bb144d9a0c6e8cd':
Only set preview size before starting preview
Alan Newberger [Sun, 5 Oct 2014 06:52:00 +0000 (06:52 +0000)]
Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
Alan Newberger [Sat, 4 Oct 2014 01:27:50 +0000 (18:27 -0700)]
Only set preview size before starting preview
Remove recursive call to startPreview when updating preview size.
Avoid invoking preview size parameter updates for all calls to
updateCameraParametersPreference, and only adjust preview size
immediately before starting preview. Also added info logging
for all call paths into startPreview() to better diagnose
sequence of events in logs if we still see any races or
ordering issues.
Bug:
17809876
Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
(cherry picked from commit
19597371a18921bb03337e4fa24c28dd2d8f06ed)
Alan Newberger [Sat, 4 Oct 2014 00:34:09 +0000 (17:34 -0700)]
Avoid porting null keys when copying preferences into new system
Testing on Fishlake shows certain preferences are of 'null' type
in shared preferences. Avoid an NPE on porting a null. From testing,
this can happen with focus mode, best to just skip porting the key
and let the app use a default.
Bug:
17829562
Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63
(cherry picked from commit
d560aabf7baef81a14e78341af81994efc1d4f17)
Alan Newberger [Sat, 4 Oct 2014 00:48:43 +0000 (17:48 -0700)]
Fix incorrect key translation in Settings refactor
Bug:
17832052
Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652
(cherry picked from commit
4032a773c4605894a2b6137590c7124ea16b7ab2)
Alan Newberger [Thu, 2 Oct 2014 17:50:07 +0000 (10:50 -0700)]
Trap CameraAgentFactory RTEs during recycle
Bug:
17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
(cherry picked from commit
4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1)
Alan Newberger [Wed, 1 Oct 2014 23:52:56 +0000 (16:52 -0700)]
Trap camera close exceptions on pause
Bug:
17759456
Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
(cherry picked from commit
48d4c8f1856503d88f4e2e42fa729f2556173694)
Neil Fuller [Thu, 2 Oct 2014 15:39:12 +0000 (16:39 +0100)]
Remove dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iae56fa116b5e00e78b294073802d48478a2c9eda
Alan Newberger [Thu, 2 Oct 2014 13:38:27 +0000 (13:38 +0000)]
am
9ee244aa: am
673ae4a4: am
04b6e4c0: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
9ee244aa0a1858abd554070780b82645650efe65':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
Alan Newberger [Thu, 2 Oct 2014 13:38:25 +0000 (13:38 +0000)]
am
4011ad4b: am
985efe10: am
36cb7fb8: am
dae542a3: Fix error in settings key from refactor
* commit '
4011ad4bb2183c9a3d56919bd11ba552cd15016a':
Fix error in settings key from refactor
Alan Newberger [Thu, 2 Oct 2014 00:46:04 +0000 (00:46 +0000)]
am
673ae4a4: am
04b6e4c0: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
673ae4a4cd57d61f9558d2d45a62045e9024b2c3':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
Alan Newberger [Thu, 2 Oct 2014 00:42:11 +0000 (00:42 +0000)]
am
985efe10: am
36cb7fb8: am
dae542a3: Fix error in settings key from refactor
* commit '
985efe1003d0bf57f52cf215ba582257e8e2071f':
Fix error in settings key from refactor
Alan Newberger [Thu, 2 Oct 2014 00:41:21 +0000 (00:41 +0000)]
am
04b6e4c0: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
04b6e4c08b279b4237f294cb00912e0bb54ae284':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
Alan Newberger [Thu, 2 Oct 2014 00:36:48 +0000 (00:36 +0000)]
am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
Alan Newberger [Thu, 2 Oct 2014 00:36:10 +0000 (00:36 +0000)]
am
36cb7fb8: am
dae542a3: Fix error in settings key from refactor
* commit '
36cb7fb8b3f89a3759f0c30709eea36ac03ae8b7':
Fix error in settings key from refactor
Alan Newberger [Thu, 2 Oct 2014 00:32:04 +0000 (00:32 +0000)]
am
dae542a3: Fix error in settings key from refactor
* commit '
dae542a3c94b1663c72cb4be29d5edf1a7aa4f30':
Fix error in settings key from refactor
Alan Newberger [Thu, 2 Oct 2014 00:18:35 +0000 (17:18 -0700)]
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
To ensure items are placed in separate affinity in document mode.
Bug:
17758840
Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
Alan Newberger [Wed, 1 Oct 2014 23:00:19 +0000 (23:00 +0000)]
am
ff91a347: am
51a625d1: am
07c463d3: am
d822d1cf: Only allow one draw call pending at a time
* commit '
ff91a347a81136bf1972b6357c08d5b09d5563ed':
Only allow one draw call pending at a time
Senpo Hu [Wed, 1 Oct 2014 23:00:18 +0000 (23:00 +0000)]
am
c127873a: am
fdd98e0f: am
f0e685d9: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
c127873af2d001f64e214f25402833eeb1fc6341':
Stability: call stopPreview() before switching off video module.
Baligh Uddin [Wed, 1 Oct 2014 23:00:18 +0000 (23:00 +0000)]
am
ef7c510a: (-s ours) am
12dd2669: (-s ours) am
d51f2cc7: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ef7c510a2104992f74e1041f5fd8e030babb7699':
Import translations. DO NOT MERGE
Senpo Hu [Wed, 1 Oct 2014 23:00:18 +0000 (23:00 +0000)]
am
94adfd2e: am
89206e4b: am
8838aba5: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
94adfd2e7b491155327d8ef6e0e0b5a8b8b57517':
Fix crash in VideoModule - Method called after release()
Alan Newberger [Wed, 1 Oct 2014 17:03:27 +0000 (17:03 +0000)]
am
51a625d1: am
07c463d3: am
d822d1cf: Only allow one draw call pending at a time
* commit '
51a625d1257b77c6b0d78ff548db2e70b0eb9f6f':
Only allow one draw call pending at a time
Senpo Hu [Wed, 1 Oct 2014 17:03:26 +0000 (17:03 +0000)]
am
fdd98e0f: am
f0e685d9: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
fdd98e0f4b573e3bde9ad0ecbf536ac5db528fbf':
Stability: call stopPreview() before switching off video module.
Alan Newberger [Wed, 1 Oct 2014 16:49:03 +0000 (09:49 -0700)]
Fix error in settings key from refactor
PANO_ORIENTATION indicator icon was using an
incorrect key to sync state.
Bug:
17752154
Change-Id: I587b2ee7eeab3758b05386540f62b79ca48299f2
(cherry picked from commit
5c9d7f34039ac96b3a136ccd6b16162e3b220848)
Alan Newberger [Wed, 1 Oct 2014 15:17:33 +0000 (15:17 +0000)]
am
07c463d3: am
d822d1cf: Only allow one draw call pending at a time
* commit '
07c463d36c00055b10532ab3fd54393ff4e2e3a5':
Only allow one draw call pending at a time
Senpo Hu [Wed, 1 Oct 2014 15:17:32 +0000 (15:17 +0000)]
am
f0e685d9: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
f0e685d91a2736ba5fd5b43db32858bdf7a70e43':
Stability: call stopPreview() before switching off video module.
Alan Newberger [Wed, 1 Oct 2014 15:03:57 +0000 (15:03 +0000)]
am
d822d1cf: Only allow one draw call pending at a time
* commit '
d822d1cfc893faa6f3d5b566a50c628ec83fa4e6':
Only allow one draw call pending at a time
Senpo Hu [Wed, 1 Oct 2014 15:00:51 +0000 (15:00 +0000)]
am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
2499af485d19e9e9843f7f8ea9a566ee24e62a33':
Stability: call stopPreview() before switching off video module.
Alan Newberger [Tue, 30 Sep 2014 21:59:32 +0000 (14:59 -0700)]
Only allow one draw call pending at a time
If modules call draw aggressively, there should only be one pending
at a time. If we get another, just drop it, there will be a draw
momentarily.
Bug:
17703978
Change-Id: I60b3b9e257ae4e064287a97973b1de878ce66de1
(cherry picked from commit
5db8e20db77bf86eba25ec713c76da783dd98b19)
Senpo Hu [Tue, 30 Sep 2014 01:49:10 +0000 (18:49 -0700)]
Stability: call stopPreview() before switching off video module.
If the preview is not stopped, the following camera operations posted
by other modules such as "apply settings" will turn camera object
in turmoil. The camera object could start throwing exception and eventually
hang.
Bug:
16300704
Bug:
17403384
Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9
(cherry picked from commit
36e045a43d9b8949d9a219b84cf894cf21f8e98a)
Baligh Uddin [Mon, 29 Sep 2014 21:11:31 +0000 (21:11 +0000)]
am
12dd2669: (-s ours) am
d51f2cc7: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
12dd2669561a70c4dd97572ba3e065b571060b00':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 21:00:20 +0000 (21:00 +0000)]
am
d51f2cc7: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
d51f2cc7176f29e1b7b950a2ef2ed533d1fba72f':
Import translations. DO NOT MERGE
Senpo Hu [Mon, 29 Sep 2014 20:50:55 +0000 (20:50 +0000)]
am
89206e4b: am
8838aba5: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
89206e4b26e8c0e4ded0474e019568c9b331c5e9':
Fix crash in VideoModule - Method called after release()
Baligh Uddin [Mon, 29 Sep 2014 20:47:01 +0000 (20:47 +0000)]
am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2f727affa9fa62c8395f628c193c36b1ab299d81':
Import translations. DO NOT MERGE
Senpo Hu [Mon, 29 Sep 2014 20:41:54 +0000 (20:41 +0000)]
am
8838aba5: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
8838aba5db3395a5b0fd2f85c4c8c4ce25da5a7f':
Fix crash in VideoModule - Method called after release()
Baligh Uddin [Mon, 29 Sep 2014 16:37:16 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 29 Sep 2014 07:36:19 +0000 (00:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie18b982e8d98467e41cc4b3a26c9ac5c5a405730
Auto-generated-cl: translation import
Senpo Hu [Mon, 29 Sep 2014 04:26:38 +0000 (04:26 +0000)]
am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
ed0fea9b36e2f645f06e04d8ac28142333621010':
Fix crash in VideoModule - Method called after release()
Senpo Hu [Mon, 29 Sep 2014 04:20:35 +0000 (04:20 +0000)]
am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
2d3475ae1f045a2062119f352bec874cd78e9d3b':
Fix crash in VideoModule - Method called after release()
Senpo Hu [Sun, 28 Sep 2014 11:30:15 +0000 (04:30 -0700)]
Fix crash in VideoModule - Method called after release()
Completely eliminate the runtime exception caused by monkey.
Sample stack trace:
java.lang.RuntimeException: Method called after release()
at android.media.MediaRecorder.setCamera(Native Method)
at com.android.camera.VideoModule.initializeRecorder(VideoModule.java:1101)
at com.android.camera.VideoModule.access$2000(VideoModule.java:88)
at com.android.camera.VideoModule$10.onStorageUpdateDone(VideoModule.java:1320)
at com.android.camera.CameraActivity$20.onPostExecute(CameraActivity.java:2014)
Bug:
17313985
Change-Id: I7ecaf375c26ebd1608d7098599ab1528609287ce
Puneet Lall [Sat, 27 Sep 2014 06:16:49 +0000 (06:16 +0000)]
am
98802754: am
c109ad76: am
f9d6b067: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
98802754fd721be3c4b67e71f4aafdc4e0cf7fe6':
Synchronize CaptureModule camera open/close operations
Puneet Lall [Sat, 27 Sep 2014 06:04:11 +0000 (06:04 +0000)]
am
c109ad76: am
f9d6b067: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
c109ad762ff2ff67ce042c1bf55fa0fc658ec01d':
Synchronize CaptureModule camera open/close operations
Puneet Lall [Sat, 27 Sep 2014 05:51:33 +0000 (05:51 +0000)]
am
f9d6b067: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
f9d6b067c5b115e08d38fc2df769012702a95ec1':
Synchronize CaptureModule camera open/close operations
Puneet Lall [Sat, 27 Sep 2014 03:19:13 +0000 (03:19 +0000)]
am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
6014e1682d94b687c4525cf49e6c4b20bbb4380a':
Synchronize CaptureModule camera open/close operations
Puneet Lall [Sat, 27 Sep 2014 01:06:23 +0000 (01:06 +0000)]
am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
022ce61e1c4f338a79585e8656ab57990ecd32c1':
Synchronize CaptureModule camera open/close operations