Andreas Huber
ca2fb9158e
Merge "Expose MediaCodec.setParameters API to" into klp-dev
2013-08-14 15:39:17 +00:00
John Spurlock
da5b6f2dc4
Normalize dream service dump check with other services.
...
Bug:10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2
2013-08-14 09:49:02 -04:00
Matthew Xie
a5c81e8636
Merge "LE: Add peripheral role support (1/4)" into klp-dev
2013-08-14 08:14:09 +00:00
Andre Eisenbach
f46b21aa99
LE: Add peripheral role support (1/4)
...
Initial stack support for the LE peripheral role.
Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
2013-08-14 00:48:24 -07:00
Matthew Xie
08c34c326f
Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev
2013-08-14 07:27:49 +00:00
Svetoslav
59703c7186
Merge "Partial implementation for the favorite and available printer tracking." into klp-dev
2013-08-14 07:09:25 +00:00
Svetoslav
66160bb881
Partial implementation for the favorite and available printer tracking.
...
1. Added a dedicated class that keeps track of the user's favorite printers
based on past usage. We keep the last 50 uses and assign a decreasing weight
to older historical use records. The printer whose records' sum is the
largest is considered the favorite for the user and so on.
2. Factored out the printer discovery logic from the print job config activity
into a separate available printers provider class. It encapsulates all the
logic to communicated with the remote print services to discover printers,
keep track of added, updated, and removed printers.
3. Preliminary scetch of the printer chooser acitivty that will show all the
printers.
Change-Id: I5524665f2a9a565f186db85214d5e41a44f4812e
2013-08-14 00:06:53 -07:00
Daniel Sandler
3dfa5eb9d9
Merge "Toward regularizing color & level across battery indicators." into klp-dev
2013-08-14 06:29:05 +00:00
Daniel Sandler
dfaf3bdeeb
Toward regularizing color & level across battery indicators.
...
Each of our existing assets is slightly incorrect in some
way: inconsistent pixel jumps from one percent to the next,
inconsistent color change, etc. The only way to get it
perfectly right is to draw it programmatically.
Bug: 8504254 // inconsistent color change threshold
-- previously --
Bug: 3136046 // in Gingerbread
Bug: 3387973 // Honeycomb
Bug: 5070948 // ICS
Change-Id: I6a3e7409ecec55e10328541ecb1e9d54aebdbe96
2013-08-13 23:21:08 -07:00
Daniel Sandler
0155a90eb4
Merge "How did that get there?" into klp-dev
2013-08-14 05:24:34 +00:00
Daniel Sandler
8800e46d84
How did that get there?
...
Whoever checked this in: Turn in your badge and your gun.
Change-Id: I635dbc3bae6a58bf425241fb4105e26cc03a9869
2013-08-13 22:19:50 -07:00
Daniel Sandler
a53d38bc28
Merge "Drop simultaneous pointer events when tracking velocity." into klp-dev
2013-08-14 02:35:33 +00:00
Andre Eisenbach
25b9cf953b
LE: Add instance ID to descriptors (1/4)
...
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.
Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
2013-08-13 19:25:05 -07:00
Daniel Sandler
69f756fe9b
Drop simultaneous pointer events when tracking velocity.
...
They're not really simultaneous, but within 1ms of one
another, which is too close for getEventTime() to
distinguish; these events were causing the velocity
computation to become (understandably) confused and
resulting in failed panel flings.
Bug: 10246454
Change-Id: I3829192cdf9ad2a222ec8deca031d772d58de0da
2013-08-13 19:24:19 -07:00
Lajos Molnar
1bab5064eb
Merge "MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities" into klp-dev
2013-08-14 01:26:39 +00:00
Kenny Root
3fbaf5a6df
am 5ad480c8: am 965eb258: am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '5ad480c8fba9a7044d827c38db235cffd52fbc13':
Use hostname verifier directly instead of instance
2013-08-13 18:26:06 -07:00
John Spurlock
8b847dba09
Merge "Delay transient navigation confirmation prompt." into klp-dev
2013-08-14 01:05:38 +00:00
Kenny Root
5ad480c8fb
am 965eb258: am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '965eb258438619774d37cce0ccf9edc976c7a343':
Use hostname verifier directly instead of instance
2013-08-13 17:59:31 -07:00
Kenny Root
965eb25843
am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '1c2cb6533bfebf8b930850215e24327420e34a4b':
Use hostname verifier directly instead of instance
2013-08-13 17:57:10 -07:00
Kenny Root
1c2cb6533b
am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '999ddae70360fc99e804d0b176af487582cd37c8':
Use hostname verifier directly instead of instance
2013-08-13 17:54:18 -07:00
Kenny Root
999ddae703
am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'ae24c0d539414805a6c979f9318d0765506221ae':
Use hostname verifier directly instead of instance
2013-08-13 17:51:15 -07:00
Kenny Root
ae24c0d539
am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'bf15c7cecefba8fdb3070c389a4966f11a8d8656':
Use hostname verifier directly instead of instance
2013-08-13 17:48:20 -07:00
Kenny Root
bf15c7cece
am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
2013-08-13 17:44:27 -07:00
Kenny Root
dceda36b00
am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
Use hostname verifier directly instead of instance
2013-08-13 17:42:45 -07:00
Kenny Root
1c5e33d37d
am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
Use hostname verifier directly instead of instance
2013-08-13 17:36:42 -07:00
John Spurlock
4cf6a948f9
Delay transient navigation confirmation prompt.
...
Ensure the nav bar is hidden, then wait about the same amount
of time before showing the prompt.
Bug:10312565
Change-Id: Ifbbbc55edf2e40844296e3e96fcc5b491f1b246f
2013-08-13 20:32:28 -04:00
Kenny Root
3bc3240ffb
am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
2013-08-13 17:31:32 -07:00
Kenny Root
a6226a2d20
am 32c99004: Use hostname verifier directly instead of instance
...
* commit '32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
2013-08-13 17:27:49 -07:00
Tom O'Neill
95b2299dc4
Merge "API for location settings injection" into klp-dev
2013-08-14 00:22:18 +00:00
Igor Murashkin
d48233e1e6
Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev
2013-08-14 00:16:42 +00:00
David Christie
2163bb0924
Merge "Don't allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn't be hidden." into klp-dev
2013-08-14 00:10:36 +00:00
David Christie
b5eaf2662c
Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider. Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement)." into klp-dev
2013-08-14 00:07:58 +00:00
destradaa
5c7e64609c
Merge "Add support in the platform for Flp Geofencing." into klp-dev
2013-08-13 23:56:31 +00:00
Robert Greenwalt
7a8d9d6fec
Merge "Add support for batched wifi scans." into klp-dev
2013-08-13 23:22:52 +00:00
David Christie
ef20fd1ea0
Don't allow airplane mode to affect location status icon.
...
Gps still operates when airplane mode is on, and consumes
just as much power so the icon shouldn't be hidden.
Change-Id: I10edc8771d3dd1831e94d26c6f61ca82d805cc12
2013-08-13 16:14:10 -07:00
David Christie
15b3191f91
Update location AppOp monitoring to respect settings.
...
If a provider is disabled, we don't mark an app as
actively using location just because it's requested
that provider. Also updates the concept of high
power to support third party custom providers
(doesn't hard code gps but looks at the provider's
actual stated power requirement).
Change-Id: Ie01243bf04d7301962ea9cdb25fb7d8d97566e02
2013-08-13 16:01:36 -07:00
destradaa
0682809ad0
Add support in the platform for Flp Geofencing.
...
Change-Id: I0fb0e276d3a06322697bb5d46323779aca1f78c5
2013-08-13 16:00:04 -07:00
Wink Saville
ba5e533eda
Merge "In isMobileOk don't execute finally if mobile data is not supported." into klp-dev
2013-08-13 22:57:54 +00:00
John Spurlock
f464511a7b
Merge "Sysui flag-related doc fixes." into klp-dev
2013-08-13 22:35:57 +00:00
Adam Skory
3890f8543a
Merge "Fix NPE in ActivityManagerService" into klp-dev
2013-08-13 22:30:51 +00:00
Kenny Root
87fefc449b
am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
...
* commit '1adbf6b900a621675cd1928307bb88bb2c6501e5':
Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 14:51:52 -07:00
Scott Main
ab69476a2b
am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
...
* commit '9b979448581311f27456c1dcb9623a8d21bcf64f':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 14:51:31 -07:00
Tom O'Neill
fa2992c412
API for location settings injection
...
- Partial fix for b/10287745
Change-Id: Ie998ce0a7b350e4183fce5753bfac3eb51238ff4
2013-08-13 14:41:22 -07:00
Igor Murashkin
53f91c5c26
camera2: Clear up docs for CameraDevice#configureOutputs
...
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
2013-08-13 14:37:42 -07:00
Robert Greenwalt
0451d59ba2
Add support for batched wifi scans.
...
bug:9301872
Change-Id: I5a7edfdbd2b78a65119d11acad491eae350c0870
2013-08-13 14:37:37 -07:00
John Spurlock
7facd7f6f1
Sysui flag-related doc fixes.
...
Add new flags to existing flag listings, fix a broken @link, and
tweak wording.
Change-Id: Iebc4f5fc1c6fc3f8685c6252f88d8044fe08b79d
2013-08-13 17:34:04 -04:00
Adam Skory
164c2edccd
Fix NPE in ActivityManagerService
...
Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
2013-08-13 14:24:34 -07:00
Kenny Root
32c990044f
Use hostname verifier directly instead of instance
...
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
2013-08-13 14:13:08 -07:00
Fabrice Di Meglio
6311399403
Merge "Code cleaning for Drawables" into klp-dev
2013-08-13 20:13:46 +00:00
Wink Saville
afe58b07db
In isMobileOk don't execute finally if mobile data is not supported.
...
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.
Bug: 10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
2013-08-13 12:41:06 -07:00