Fabrice Di Meglio
d0abcedece
Merge "Introduce the SearchIndexablesProvider and its friends"
2014-03-20 01:12:06 +00:00
Dianne Hackborn
024a003d4c
Merge "batstats: fix wake lock tracking, service bug"
2014-03-20 00:43:37 +00:00
Igor Murashkin
7d9a8ffd08
camera: Fix setParameters for Preview FPS single/range values
...
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
2014-03-20 00:21:44 +00:00
Dianne Hackborn
40c8725804
batstats: fix wake lock tracking, service bug
...
- Fix bug I introduced in handling wake lock changes where
we weren't iterating over the new work sources correctly.
- Fix bug in ActiveServices that would wtf too much.
- Prepare to start tracking uptime in the battery history.
Change-Id: Ia94316be51bc6eab7b02f214a5c40c08e99cc3b1
2014-03-19 17:13:43 -07:00
Wei Wang
b4b66d2f3a
Merge "Move advetise clean up to callback code. fixes b/13289050"
2014-03-20 00:12:23 +00:00
Wei Wang
809476525f
Move advetise clean up to callback code. fixes b/13289050
...
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
2014-03-20 00:04:27 +00:00
John Spurlock
a1bfe65daa
Fix javadoc @links in Vibrator.
...
Change-Id: I5143334735a1bcdf8252687e703c74656ff9d126
2014-03-19 19:29:34 -04:00
Fabrice Di Meglio
b49995d4d9
Introduce the SearchIndexablesProvider and its friends
...
- enable retrieval of search data to be indexed
Change-Id: I4a16408dec3d3305bf20107fb11eb2d1aee7fad5
2014-03-19 15:44:01 -07:00
John Spurlock
07cf4da1d0
Merge "Add stream-level suppression to vibrate/audio services."
2014-03-19 21:58:19 +00:00
Wei Wang
ffbea5c7da
Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671."
2014-03-19 21:29:59 +00:00
Jeff Brown
c768e1b673
am 3e1b03e4: am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
...
* commit '3e1b03e4e73d46a752537e6dcec9abdf6f5116a6':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
2014-03-19 20:28:03 +00:00
Jeff Brown
5693d40360
am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
...
* commit '96abebd02559137fa320a17c5b7a985d6fc068ba':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
2014-03-19 20:16:18 +00:00
Jeff Sharkey
c1ae44fb8a
Merge "Define an OEM directory, scan features and APKs."
2014-03-19 20:16:17 +00:00
Jeff Brown
96abebd025
am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
...
* commit '80af53162477385f20956a55305d0c048ef5c1df':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
2014-03-19 20:11:12 +00:00
Jeff Brown
80af531624
am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
...
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
2014-03-19 20:05:40 +00:00
Jeff Brown
f260ed0926
Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
2014-03-19 20:01:42 +00:00
Jeff Sharkey
1be762c1ba
Define an OEM directory, scan features and APKs.
...
To support OEM customizations, define a new top-level directory
that roughly mirrors the layout of the system partition. Scan this
location for (non-privileged) apps, and for additional features.
Bug: 13340779
Change-Id: Idb6d6626655061ee31ad952cab734d30ea6130b9
2014-03-19 12:44:48 -07:00
Robert Greenwalt
1b98e90db0
resolved conflicts for merge of 0bff77d6 to master
...
Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
2014-03-19 12:41:54 -07:00
John Spurlock
1af30c7ac4
Add stream-level suppression to vibrate/audio services.
...
- Add new audio restriction layer to app-ops. Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled. Restrictions
also support a whitelisted set of exempt package names.
- Add new audio stream-level checks to app-ops.
- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.
- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.
- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.
- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.
Change-Id: Ifae8952647202f728cf1c73e881452660c704678
2014-03-19 15:32:51 -04:00
Robert Greenwalt
45b1e5ec05
am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
Handle provisioning APN by turning off/on data.
2014-03-19 19:13:00 +00:00
Robert Greenwalt
42b746e4d8
am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
2014-03-19 19:08:44 +00:00
Robert Greenwalt
bd84f01c6c
am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit '5d3d4ee3005e910dce780074d3f68d594aa12070':
Handle provisioning APN by turning off/on data.
2014-03-19 16:15:22 +00:00
Robert Greenwalt
5d3d4ee300
Merge "Handle provisioning APN by turning off/on data." into klp-dev
2014-03-19 16:12:01 +00:00
George Mount
31dc8f701f
Merge "Fix ActionBar layout bug when INVISIBLE."
2014-03-19 14:25:23 +00:00
Wei Wang
f305589f22
Add status callback for start/stop advertising.
...
Fixes b/13289050, b/13418851, also fixes 13418671.
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
2014-03-18 19:33:16 -07:00
Zhijun He
555084b3a5
Merge "Camera2: Update exposureTimeRange related docs"
2014-03-19 02:12:08 +00:00
Dave Platt
c76bccd6ea
am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
...
* commit '17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
Harden NsdManager against null-dereference crashes
2014-03-19 00:59:47 +00:00
Jeff Brown
aba566589e
Fix inverted conditional in View.setFilterTouchesWhenObscured.
...
Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
2014-03-18 17:59:21 -07:00
Dave Platt
17e7c4076b
am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
...
* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
Harden NsdManager against null-dereference crashes
2014-03-19 00:54:54 +00:00
Dave Platt
98a027a506
Merge "Harden NsdManager against null-dereference crashes" into klp-dev
2014-03-19 00:50:30 +00:00
Zhijun He
ca2926f83b
Camera2: Update exposureTimeRange related docs
...
Bug: 13250951
Change-Id: I8a77feb1b9877c75fd5a41a324fe17605ed338e0
2014-03-18 16:21:45 -07:00
George Mount
14a9738330
Fix ActionBar layout bug when INVISIBLE.
...
ActionBar did not layout properly when INVISIBLE, but worked
when VISIBLE or GONE.
Change-Id: I30ca85377f3516c79174a35b65648d4ca68e927a
2014-03-18 15:48:00 -07:00
Ashish Sharma
0535a9f7aa
Include elapsed realtime (nanos) of the event in the radio state change notifications.
...
Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941
2014-03-18 21:42:02 +00:00
Doug Zongker
dd23853e63
am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset
...
* commit '06fe82d8e01780b7b6c16364f81f8dd75d467420':
add option to shutdown after factory reset
2014-03-18 21:00:04 +00:00
Doug Zongker
2e6d960c85
am cdf00888: add option to shutdown after factory reset
...
* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
add option to shutdown after factory reset
2014-03-18 20:49:12 +00:00
Doug Zongker
cdf0088839
add option to shutdown after factory reset
...
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system. Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.
Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
2014-03-18 12:52:04 -07:00
Ruben Brunk
6dc379c7bd
hal3: Add missing available mode tags.
...
Change-Id: I588aacade5c5638967970e2e7eb04924c0ea9cc7
2014-03-18 11:13:44 -07:00
Svetoslav
fcf3b103f0
Merge "Update print docs"
2014-03-18 18:00:01 +00:00
Wink Saville
c8e8e3eba6
Handle provisioning APN by turning off/on data.
...
This is a start and two tests succeed:
Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.
I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...
The current bug is below, but it is poorly named either it should be
renamed or a new bug created.
Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
2014-03-18 10:58:40 -07:00
Svetoslav
85a85a0ed7
Update print docs
...
Change-Id: I671ad776968ca2802f05f94f7cc96959fb50fa4b
2014-03-18 10:48:51 -07:00
Svetoslav
73832594b3
Merge "Updated print docs."
2014-03-18 17:43:13 +00:00
Svetoslav
81f14b9689
Updated print docs.
...
Added an explanation why the system cannot maintain print UI
state on rotation.
Change-Id: I370158ba4be929b67a4b5476ccacad5335d18b34
2014-03-18 10:42:16 -07:00
Dianne Hackborn
e9ebd60fc4
Merge "Treat IME processes as hosting activities"
2014-03-18 16:50:25 +00:00
Kenny Guy
ecc9f9b6f3
Merge "Add flag to allow fetching related users recent tasks."
2014-03-18 11:43:46 +00:00
Mark Renouf
bb01571427
am 29799080: Make InternalListener static to avoid referencing SpeechRecognizer.
...
* commit '297990806dcbdc4413314847b897c9cb5452a1bc':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-18 02:02:59 +00:00
Mark Renouf
297990806d
Make InternalListener static to avoid referencing SpeechRecognizer.
...
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit b37866db46 )
2014-03-18 01:58:39 +00:00
Mark Renouf
95478f67a4
Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
2014-03-18 01:58:26 +00:00
Wonsik Kim
edb67190d6
Merge "Revert "VideoPlaneView initial implementation""
2014-03-18 01:00:59 +00:00
Alan Viverette
97d9b65470
Lower tap timeout to 100ms, because 180ms is a lot of ms
...
Change-Id: I708848480544825474785e0918feba70c1089090
2014-03-17 16:16:33 -07:00
Dianne Hackborn
f0f94d129b
Treat IME processes as hosting activities
...
When we stop using an IME process, we still treat that
process as if it is hosting activities (in the activity part
of the LRU list), to try to keep it around. This is intended
to help the experience of switching between IMEs, reducing
the chance of your previous IME process being killed and thus
requiring much more time to switch.
Change-Id: Ie5793fd9b40d980fa18f80246326511ed6ae0597
2014-03-17 16:04:21 -07:00