130416 Commits

Author SHA1 Message Date
Matthew Xie
8fce094491 Merge changes I0c808d51,I4ecf0ede
* changes:
  Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
  Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit Bluetooth UUIDs. Added unit tests.
2014-05-07 05:48:07 +00:00
Sharvil Nanavati
a0ee00ec13 Merge "Make sure BluetoothSocket#connect throws on error." 2014-05-07 05:22:21 +00:00
Tao Bai
fa1fd2cb7d Public WebView permission API
BUG: 13699047
Change-Id: Ibcc8c0d4f1bba4365cb71c1991a0fcb1d7febb94
2014-05-06 21:17:54 -07:00
Jim Miller
08fa40c5cb First pass at adding FingerprintManagerService
This adds a new service for monitoring and enrolling fingerprints
to the platform.

Fixed documentation links.

Change-Id: I66013be5e09be9c5f9746c46aacf32d3e26c3b73
2014-05-07 02:27:21 +00:00
Sharvil Nanavati
37fce07bea Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
2014-05-06 19:20:46 -07:00
Wei Wang
82500dd866 Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit
Bluetooth UUIDs. Added unit tests.

Change-Id: I4ecf0ede02561a5e9815acf8a5a1309d5756b887
2014-05-06 19:20:46 -07:00
Sharvil Nanavati
3e8eb40950 Make sure BluetoothSocket#connect throws on error.
It sometimes fails silently, resulting in callers using the socket
even though it hasn't been initialized.

http://b/13909270

Change-Id: Ied08982b51d44c3d2dec72785888ea6c6497a664
2014-05-06 19:20:45 -07:00
Jeff Brown
6c8e788e37 Merge "Fix crash due to texture view callback threading invariants." 2014-05-07 00:47:08 +00:00
Jungshik Jang
a9095ba488 Implement more native api for Hdmi cec.
HAL interface for CEC has more apis that haven't
connected with HdmiCecController.
Here is a list of apis.

1. addLogicalAddress
2. clearLogicalAddress
3. getPhysicalAddress
4. getVersion
5. getVendorId

Verified that it does not affect to other components in nakasi

Change-Id: I535bde47c43dd25bbede002c0a2aefbe86779076
2014-05-07 00:36:26 +00:00
Glenn Kasten
317510ff30 Merge "Add AudioFormat.ENCODING_PCM_FLOAT" 2014-05-07 00:28:07 +00:00
Glenn Kasten
313f59887b Add AudioFormat.ENCODING_PCM_FLOAT
Change-Id: I030d2c74224ac8573a4d30d980ae94fa4e280aeb
2014-05-06 17:24:26 -07:00
Winson Chung
c9e7b1e3da Merge "Fixing issue with animation not running after SystemUI crashes (Bug 14453240)" 2014-05-07 00:22:50 +00:00
Chet Haase
5b37b5e51d Merge "Doc fix in TypeEvaluator method docs" 2014-05-07 00:18:43 +00:00
Jeff Brown
c7282e57cd Fix crash due to texture view callback threading invariants.
Allow the client of a SurfaceTexture to specify the Handler to
which the update callback should be directed to avoid unnecessary
scheduling ping-pong between threads.

Fixed an invalid assumption in TextureView that it is attached
to the main looper which could result in a crash under certain
circumstances.  In normal app processes, it is true that TextureViews
must be created on the main looper since hardware rendering is
currently only supported on the main looper.  However, in the
system server, UI components run a different thread.  Although
hardware rendering is normally disabled in the system server,
it may be enabled for certain developer features.

Bug: 14445309
Change-Id: I5ae17ad018b9ef05ba87ec2f972c7c82e2bca70a
2014-05-06 17:13:43 -07:00
Winson Chung
96e3bc1f8d Fixing issue with animation not running after SystemUI crashes (Bug 14453240)
- Falling back to default transition if we don't have a thumbnail (Bug 14589475)
- Tweaking over scroll to prevent scrolling past a certain point (Bug 14582630)
- Fixing issue with missing top padding in the stack view
- Adding some shadowing to distinguish similar cards from each other
2014-05-06 17:13:28 -07:00
Chet Haase
5f9ea81c99 Doc fix in TypeEvaluator method docs
Change-Id: Ie20ba820b0a3a6b8f0f6120dfcfc8bba6adf29b3
2014-05-06 17:07:16 -07:00
Scott Main
3b23c019cf am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.
* commit 'b5342f965b19a053b093f554930893b91c2e763e':
  fix code error. The data type was wrong, but it's actually not needed.
2014-05-07 00:00:20 +00:00
Scott Main
b5342f965b am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.
* commit 'fe99729539c8e51ce13c88dd9c999a458032356a':
  fix code error. The data type was wrong, but it's actually not needed.
2014-05-06 23:57:08 +00:00
Scott Main
fe99729539 am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.
* commit '01dc133b35021878b9c7c45d862cacb2b7645a4d':
  fix code error. The data type was wrong, but it's actually not needed.
2014-05-06 23:53:22 +00:00
Scott Main
01dc133b35 am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.
* commit 'f1bc39b8ae9d63f3c7d89f3d07ec026c62de6e6e':
  fix code error. The data type was wrong, but it's actually not needed.
2014-05-06 23:50:27 +00:00
Winson Chung
5269a01c6d Merge "Fixing regression in calculating which activities to apply recents values to." 2014-05-06 23:46:00 +00:00
Scott Main
f1bc39b8ae fix code error.
The data type was wrong, but it's actually not needed.

Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
2014-05-06 16:34:30 -07:00
Glenn Kasten
8547e7022e Merge "Add AudioFormat.getBytesPerSample and use it" 2014-05-06 23:09:07 +00:00
Winson Chung
3aeaebb6fc Fixing regression in calculating which activities to apply recents values to. 2014-05-06 15:44:36 -07:00
Kenny Root
2cfedd94b3 Unhide new SSL APIs
Change-Id: Ic58d5571754f434bb8f72b09329e8803d4343ba2
2014-05-06 15:00:45 -07:00
Zhijun He
379af01292 Camera2: Add missing capture result tags
All capture request tags should be available in capture result.

Bug: 14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316
2014-05-06 21:46:27 +00:00
Tim Kilbourn
0652842400 am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
  DO NOT MERGE Hide banner manifest attribute.
2014-05-06 21:26:56 +00:00
Tim Kilbourn
1a556b9961 am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
* commit '17c5e990379baf887221c0776b4152613c2a8a2d':
  DO NOT MERGE Hide banner manifest attribute.
2014-05-06 21:24:02 +00:00
Tim Kilbourn
17c5e99037 Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev 2014-05-06 21:21:37 +00:00
Dan Stoza
9bd01ef0c6 Merge "Enable changing display configuration" 2014-05-06 21:08:15 +00:00
Jeff Brown
cedde01622 am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
* commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:34:12 +00:00
Jeff Brown
a93369a819 am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:30:49 +00:00
Jeff Brown
996e269d93 Merge "Plumb display state and interactive information to BatteryStats." 2014-05-06 20:28:36 +00:00
Jeff Brown
84aaf124b7 Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 2014-05-06 20:27:34 +00:00
Adam Powell
5f97930fc5 am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup
2014-05-06 20:24:23 +00:00
Jeff Brown
e95c3cd895 Plumb display state and interactive information to BatteryStats.
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:23:53 -07:00
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Jeff Brown
01ee6f6cf7 Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:18:19 -07:00
Adam Powell
a0516e7ad1 Merge "onWindowDismissed API cleanup" into klp-modular-dev 2014-05-06 20:17:31 +00:00
Chris Craik
55d47f6be8 Merge "Fix pivot update rejection logic" 2014-05-06 20:17:29 +00:00
Jorim Jaggi
ef3b18b101 Merge "Never close Keyguard automatically." 2014-05-06 20:01:43 +00:00
Tim Kilbourn
d689db4f0c DO NOT MERGE Hide banner manifest attribute.
Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485
2014-05-06 12:02:42 -07:00
Dan Stoza
00101052b5 Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
2014-05-06 11:34:06 -07:00
Chris Craik
6c1787cfea Fix pivot update rejection logic
bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
2014-05-06 11:02:39 -07:00
Tim Kilbourn
a2d106d470 Fix bad merge.
Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d
2014-05-06 10:54:00 -07:00
Tim Kilbourn
d06b29d0f7 am f7330ac7: am 989dab11: Update current.txt after hiding isGame.
* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
  Update current.txt after hiding isGame.
2014-05-06 17:46:02 +00:00
Tim Kilbourn
23b0d53541 am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
  DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:45:58 +00:00
Tim Kilbourn
f7330ac754 am 989dab11: Update current.txt after hiding isGame.
* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
  Update current.txt after hiding isGame.
2014-05-06 17:42:36 +00:00
Tim Kilbourn
a7b267b81b am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
  DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:42:31 +00:00
Tim Kilbourn
989dab11d1 Update current.txt after hiding isGame.
Change-Id: I034126f464fdd759c19ff55000004d36463d9cd6
2014-05-06 10:40:24 -07:00