112962 Commits

Author SHA1 Message Date
Michael Wright
8091f2262f am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev
* commit 'edaf6af16a5c33557a9c4ed00f9bebdac0dd83aa':
  Remove tap to click from touch nav devices
2013-09-06 19:05:47 -07:00
Michael Wright
d13fa0018b am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev
* commit '7b4f60deb2819496733c0c85c57c6236900fe0c2':
  Special case game controller fallback keys for Japan
2013-09-06 19:05:44 -07:00
Michael Wright
edaf6af16a Merge "Remove tap to click from touch nav devices" into klp-dev 2013-09-07 02:04:46 +00:00
Michael Wright
7b4f60deb2 Merge "Special case game controller fallback keys for Japan" into klp-dev 2013-09-07 02:04:20 +00:00
Jeff Brown
c677ff8c3b am cbf2b02d: am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev
* commit 'cbf2b02d6c288c49f5bdbcb70d87c44d26086ba4':
  Fix native crash when message queue quits.
2013-09-06 18:41:43 -07:00
Jeff Brown
cbf2b02d6c am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev
* commit '23a5f44c5a306b4a70821722a697da55cc3c5db8':
  Fix native crash when message queue quits.
2013-09-06 18:39:09 -07:00
Jeff Brown
c9f779824e am affacbcc: am 82975e40: Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev
* commit 'affacbcceda789021c338d8aac3ff40e33c33e4c':
  Emit a more meaningful cause for watchdog restarts.
2013-09-06 18:38:11 -07:00
Jeff Brown
affacbcced am 82975e40: Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev
* commit '82975e40083b86d2619ffa60ff7351928ec35978':
  Emit a more meaningful cause for watchdog restarts.
2013-09-06 18:35:34 -07:00
Jeff Brown
23a5f44c5a Merge "Fix native crash when message queue quits." into klp-dev 2013-09-07 01:34:52 +00:00
Jeff Brown
82975e4008 Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev 2013-09-07 01:33:00 +00:00
Sandeep Siddhartha
a4f0c01ae5 am ea6c0bcd: am 1cf2b91f: Merge "Fixing build break" into klp-dev
* commit 'ea6c0bcd6bb0b4b426cff963db22327c62e73f76':
  Fixing build break
2013-09-06 18:15:19 -07:00
Sandeep Siddhartha
ea6c0bcd6b am 1cf2b91f: Merge "Fixing build break" into klp-dev
* commit '1cf2b91fe533d9e50bce6e5551ae26bccdb4a965':
  Fixing build break
2013-09-06 18:13:44 -07:00
Sandeep Siddhartha
1cf2b91fe5 Merge "Fixing build break" into klp-dev 2013-09-07 01:11:26 +00:00
Jeff Brown
013cf847bc Fix native crash when message queue quits.
Fix a race when quitting the looper's message queue that could
cause the mPtr field to be zeroed out and the native object to
be destroyed while still in use.

This happened due to an optimization that was intended to release
the native looper's file descriptor as soon as the last message
was processed rather than waiting for the finalizer to run.

Bug: 9726217
Change-Id: I695a9a657acfdb3ce65a5737ff20cd11113d15fa
2013-09-06 18:07:12 -07:00
Sandeep Siddhartha
05203c1e4b Fixing build break
Change-Id: I89d1416b356423ee795f01b4c3200bcaa3ec8389
2013-09-06 18:04:48 -07:00
Victoria Lease
ffd04bddc7 am 2eb7abce: Merge "resolved conflicts for merge of 5d34e4d6 to klp-dev-plus-aosp" into klp-dev-plus-aosp
* commit '2eb7abce49f2bc4d2d6d74291219f13ba5e2cbf8':
  include Padauk in fallback chain
2013-09-06 17:31:09 -07:00
Victoria Lease
2eb7abce49 Merge "resolved conflicts for merge of 5d34e4d6 to klp-dev-plus-aosp" into klp-dev-plus-aosp 2013-09-07 00:29:23 +00:00
Victoria Lease
29a311638b resolved conflicts for merge of 5d34e4d6 to klp-dev-plus-aosp
Change-Id: I101085c64af7220bc1e546b83fa1fc16783393be
2013-09-06 17:10:18 -07:00
Robert Greenwalt
35027bf895 am 37d4cd47: am dac56db6: Merge "Fix the build." into klp-dev
* commit '37d4cd4729b4433d997e0bdbc9446c92b6b80b2a':
  Fix the build.
2013-09-06 17:05:50 -07:00
Robert Greenwalt
37d4cd4729 am dac56db6: Merge "Fix the build." into klp-dev
* commit 'dac56db680251dd9bd3913b6152d33457366c722':
  Fix the build.
2013-09-06 17:02:28 -07:00
Robert Greenwalt
dac56db680 Merge "Fix the build." into klp-dev 2013-09-06 23:57:57 +00:00
Stan Chesnutt
44a8fe1f54 am 0b87a637: am f3b88c7a: Merge "Simplistic fix for initialization race" into klp-dev
* commit '0b87a6373c4f92e81e5375ec59474588e820ef92':
  Simplistic fix for initialization race
2013-09-06 16:57:50 -07:00
Stan Chesnutt
0b87a6373c am f3b88c7a: Merge "Simplistic fix for initialization race" into klp-dev
* commit 'f3b88c7a420df1877cb3ea2b38094da72353bd31':
  Simplistic fix for initialization race
2013-09-06 16:54:39 -07:00
Stan Chesnutt
f3b88c7a42 Merge "Simplistic fix for initialization race" into klp-dev 2013-09-06 23:52:33 +00:00
Sandeep Siddhartha
b10e269c36 am fc25c935: am c7deeffb: Updating current.txt after unhiding HotwordRecognition API
* commit 'fc25c935ab468f327f3fe42649269671667e7974':
  Updating current.txt after unhiding HotwordRecognition API
2013-09-06 16:51:08 -07:00
Robert Greenwalt
69df743f74 Fix the build.
Change-Id: Ia5d29de9db7ea8fd467b3bde551a8cfb95877b41
2013-09-06 16:49:37 -07:00
Sandeep Siddhartha
fc25c935ab am c7deeffb: Updating current.txt after unhiding HotwordRecognition API
* commit 'c7deeffb0c649eb911bbbbd32a1de34aab0b1eb6':
  Updating current.txt after unhiding HotwordRecognition API
2013-09-06 16:47:58 -07:00
Dianne Hackborn
38ed2a471a Work on issue #10130785: Restore silence and vibrate settings...
...in settings > sound

Add a new ContentProvider API to canonicalize URIs, so they can
be transported across backup/restore.

Change-Id: Ie5af3662f6822a32310e49c7f1e1ff084986c56e
2013-09-06 16:39:59 -07:00
Sandeep Siddhartha
c7deeffb0c Updating current.txt after unhiding HotwordRecognition API
Change-Id: Ib9975c857cba2ac0fbadc85ae5f44d278943238e
2013-09-06 16:39:52 -07:00
Jeff Brown
7dd2d19725 Emit a more meaningful cause for watchdog restarts.
Print the real thread name and a better indication of where the
hang was detected.

Bug: 10646480
Change-Id: Ic94742d0db08b8531cfd1429bb0026d6c30b779d
2013-09-06 16:23:54 -07:00
John Spurlock
f1183d791b am 5e8f5fd2: am 5109041f: Merge "Update signal, wifi, battery assets + global dimming." into klp-dev
* commit '5e8f5fd23d7f9c7d87b98d13dfed9bd243e61ab9':
  Update signal, wifi, battery assets + global dimming.
2013-09-06 16:19:40 -07:00
John Spurlock
5e8f5fd23d am 5109041f: Merge "Update signal, wifi, battery assets + global dimming." into klp-dev
* commit '5109041f79fb6f649cecadf15008bb173b7bc831':
  Update signal, wifi, battery assets + global dimming.
2013-09-06 16:15:58 -07:00
Craig Mautner
9dc03c14c1 am cc1b52c7: am fc1d8f0a: Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev
* commit 'cc1b52c7f0b26f944ee597f6f8ac9d78d13de308':
  Fix deadlock by keeping local copy of currentUserId
2013-09-06 16:12:37 -07:00
John Spurlock
5109041f79 Merge "Update signal, wifi, battery assets + global dimming." into klp-dev 2013-09-06 23:10:30 +00:00
Craig Mautner
cc1b52c7f0 am fc1d8f0a: Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev
* commit 'fc1d8f0a96285c61264fe4ba079caccabcb6206d':
  Fix deadlock by keeping local copy of currentUserId
2013-09-06 16:08:56 -07:00
Craig Mautner
fc1d8f0a96 Merge "Fix deadlock by keeping local copy of currentUserId" into klp-dev 2013-09-06 23:05:27 +00:00
Robert Greenwalt
e52785e6a7 am 9234e15d: am ecd0db5a: Merge "Setting MTU size for specific network." into klp-dev
* commit '9234e15d8d4d99b211e6bb5c199790a77cf36be7':
  Setting MTU size for specific network.
2013-09-06 15:49:42 -07:00
Xia Wang
077b2e6c02 Merge "Remove system user id for cm tests" 2013-09-06 22:46:24 +00:00
Robert Greenwalt
9234e15d8d am ecd0db5a: Merge "Setting MTU size for specific network." into klp-dev
* commit 'ecd0db5a7391e8234b3ea5d9e21c19f5d6589b0a':
  Setting MTU size for specific network.
2013-09-06 15:44:24 -07:00
Craig Mautner
d625ab2afb Fix deadlock by keeping local copy of currentUserId
Fetching current user id from activity causes a deadlock when
holding the window manager lock.

Fixes bug 10555852.

Change-Id: Ib7911ef28b81aaf7f02cce311be193b36677a26d
2013-09-06 15:43:23 -07:00
Sreeram Ramachandran
dd2fc86db7 am 086a36f5: am 1aa3202b: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
* commit '086a36f5a9d498c0aee789fe50e4d4dde6457c52':
  Minor fixes: Add a missing "break" and some cosmetic fixes.
2013-09-06 15:42:51 -07:00
Robert Greenwalt
ecd0db5a73 Merge "Setting MTU size for specific network." into klp-dev 2013-09-06 22:42:10 +00:00
Sreeram Ramachandran
086a36f5a9 am 1aa3202b: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
* commit '1aa3202b1bf72bb9a9ec20e60bf7b4fce8369acf':
  Minor fixes: Add a missing "break" and some cosmetic fixes.
2013-09-06 15:40:50 -07:00
Aravind Akella
0e6a43ea9a am 3d6aa958: am fcf5809a: Merge "Sensor batching APIs for review." into klp-dev
* commit '3d6aa9587d7e9718a1024fb5b2e75f2e9658e3eb':
  Sensor batching APIs for review.
2013-09-06 15:39:19 -07:00
Sreeram Ramachandran
1aa3202b1b Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev 2013-09-06 22:37:21 +00:00
Aravind Akella
3d6aa9587d am fcf5809a: Merge "Sensor batching APIs for review." into klp-dev
* commit 'fcf5809ad43669c2e765aa093a8356959469fd9c':
  Sensor batching APIs for review.
2013-09-06 15:37:16 -07:00
John Spurlock
21efa9ade3 Update signal, wifi, battery assets + global dimming.
Global status bar dimming is now 75%.

Signal/wifi: use problem color if not fully connected.

Battery: frame 40% white, charge level = white, new hollow bolt.
  (hollow bolt simulated for now until we can draw it in code)

Update ic_notification_overlay, all sizes.

Workaround animation bug on tablets.

Bug:10502089
Change-Id: I10f979b7a48ccb1bc94022d8c189ec216283dbe6
2013-09-06 18:35:50 -04:00
Dianne Hackborn
1775ebb76f am b6459eb2: am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev
* commit 'b6459eb25f0593561389d7cb3da38a4f960cce14':
  Implement issue #10550827: watching gpu memory for occam_svelte
2013-09-06 15:34:43 -07:00
Xia Wang
575495c290 Remove system user id for cm tests
Change-Id: I51f500c8e7b4e2963093e20c6f20bcfe020995c9
2013-09-06 15:31:53 -07:00
Aravind Akella
fcf5809ad4 Merge "Sensor batching APIs for review." into klp-dev 2013-09-06 22:30:19 +00:00