Commit Graph

46044 Commits

Author SHA1 Message Date
Vinit Deshpande
3b444db1d6 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I363403bf73b202f03b3f706a823b0f142183a695
2015-03-15 13:41:25 -07:00
Vinit Deshpande
aae695b50d am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""
merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b
2015-03-15 13:41:14 -07:00
Vinit Deshpande
4447a5e2c7 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62
2015-03-15 13:41:04 -07:00
Vinit Deshpande
79baf378d2 am "Add multi-SIM fields to VoicemailContract.Status."
merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.
2015-03-15 13:40:45 -07:00
Vinit Deshpande
e94d762182 am "Refactor NetworkUtils interaction with DHCP."
merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.
2015-03-15 13:40:27 -07:00
Vinit Deshpande
f5fabf1542 am "Separate NAT from forwarding."
merged from goog/mirror-m-wireless-internal-release
35e36db Separate NAT from forwarding.
2015-03-15 13:40:20 -07:00
Vinit Deshpande
7e05b6770c am "WFC configuration: add carrier and device support configurations."
merged from goog/mirror-m-wireless-internal-release
9c8f21b WFC configuration: add carrier and device support configurations.
2015-03-15 13:39:13 -07:00
Jeff Brown
3e0045e0df Merge "Avoid rebuilding epoll set when PFD status report is done." 2015-03-13 19:12:04 +00:00
Jeff Brown
031b7feb0f Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""" 2015-03-13 19:11:39 +00:00
Nick Kralevich
d028356056 am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."
* commit '870110e01af5c4875a9cf7134cee7c6842fd31af':
  Drop unusable SELinux APIs.
2015-03-13 18:26:20 +00:00
Nick Kralevich
870110e01a am 30fcd2aa: Merge "Drop unusable SELinux APIs."
* commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
  Drop unusable SELinux APIs.
2015-03-13 18:16:58 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs.
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:09:26 -04:00
Raph Levien
676fa348d0 Merge "Start moving text measurement into native code" 2015-03-13 17:26:32 +00:00
Raph Levien
70616ecd22 Start moving text measurement into native code
We want to move text measurement into native code, mostly so that
alternate measurement for hyphens can be performant. This patch begins
that migration, in the main StaticLayout case, but still surfaces the
widths array to Java (for ellipsis calculation), and also includes a
hack (used mostly for testing) for computing widths in Java and sending
them down to native code when TextPaint is subclassed.

Change-Id: I476c9e8b3aa8e4e3552eb18f66c4bcd5683f3a72
2015-03-13 10:11:57 -07:00
Dianne Hackborn
484bc6e5a7 Merge "More work on collecting assist data." 2015-03-13 16:41:29 +00:00
Benjamin Franz
815eca184e Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN" 2015-03-13 16:03:05 +00:00
Santos Cordon
50ac385417 Merge "Do not hide any call log entries when they are added." 2015-03-13 16:00:37 +00:00
Clara Bayarri
80c3856122 Support a Primary and a Floating ActionMode in DecorView.
This CL modifies the support for a single ActionMode in PhoneWindow.
DecorView to support both a Primary and a Floating ActionModes
simultaneously.

Things pending after this CL:
- Handling an actual Floating ActionMode
- Cleaning up the now unused ActionModeWrapper and its related code

Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365
2015-03-13 10:51:51 +00:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls.
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
2015-03-13 10:51:51 +00:00
Benjamin Franz
68cc42009e Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN
Bug: 19704419
Change-Id: I3fc970eae8ef947775b6b565916bb245dea1b43b
2015-03-13 09:44:44 +00:00
Andreas Gampe
db64454b33 resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
2015-03-13 00:04:10 -07:00
Jeff Brown
b2a1985b13 Avoid rebuilding epoll set when PFD status report is done.
If we close the PFD status channel before returning, then the Looper
will take care of unregistering it correctly but it will end up
doing extra work to rebuild the epoll set to work around a limitation
of the epoll interface.  If we unregister the FD first then this
extra work will not be required so it's slightly more efficient
this way.

Bug: 19715279
Change-Id: I0f7b90f3458adf1894b7561c05fa842fdb87b498
2015-03-12 19:52:46 -07:00
Jeff Brown
6fd9f9af2e Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""
This reverts commit 0f0b7f2fb3.
2015-03-12 19:45:47 -07:00
Wenchao Tong
c3b022ded1 Merge "NetworkStatsService to adjust VPN stats before recording." 2015-03-13 00:54:09 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Hui Shu
d7c7e566aa Merge "Add API for WebView OffscreenPreRaster setting." 2015-03-13 00:38:47 +00:00
Dianne Hackborn
a83ce1dd2a More work on collecting assist data.
Optimize parceling of AssistData (which is now renamed to
AssistStructure) by pooling duplicated class name strings.

Change text associated with a view node to a CharSequence,
so styling information comes along.

Include global text attributes -- size, colors, etc.

Introduce a new AssistContent structure, which allows us
to propagate information about the intent and data the
activity is looking at.  This further allows us to propagate
permission grants, so the assistant can dig in to that data.
The default implementation propagates the base intent of an
activity, so if for example you bring up the assistant while
doing a share the assistant itself has the same information
and access that was given to the share activity (so it could
for example share it in another way if it wanted to).

Did some optimization of loading PersistableBundle from xml,
to avoid duplicating hash maps and such.

Changed how we dispatch ACTION_ASSIST to no longer include
the more detailed AssistStructure (and new AssistContent)
data when launching; now the example code that intercepts
that needs to be sure to ask for assist data when it starts
its session.  This is more like it will finally be, and allows
us to get to the UI more quickly.

Change-Id: I88420a55761bf48d34ce3013e81bd96a0e087637
2015-03-12 17:07:51 -07:00
Marco Nelissen
a80ac05f85 resolved conflicts for merge of 42f55d1e to master
Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
2015-03-12 16:17:45 -07:00
Hui Shu
b1ee70b149 Add API for WebView OffscreenPreRaster setting.
BUG: 19592029
Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3
2015-03-12 16:04:07 -07:00
Wenchao Tong
8726e9a73e Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Roozbeh Pournader
4f831caa49 Merge "Fix negative touch word offset that caused crashing when selecting text" 2015-03-12 21:45:22 +00:00
Jeff Brown
c3eea84a0b Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" 2015-03-12 21:25:40 +00:00
Jeff Brown
0f0b7f2fb3 Revert "Update ParcelFileDescriptor to use non-blocking I/O."
Bug: 19715279
This reverts commit a34a3bdcbf.

Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347
2015-03-12 21:25:00 +00:00
Yin-Chia Yeh
d6ee06a0c8 Merge "Camera: add @hide API for setting camera rotation" 2015-03-12 20:36:49 +00:00
Mady Mellor
27d6b97f63 Fix negative touch word offset that caused crashing when selecting text
Previously the offset between the touch event and the start / end of
the word could result in a negative value - we don't care or want
this value to be negative. The negative value also causes the returned
offset to be outside the bounds of the text which resulted in a crash.

Bug: 19705184
Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730
2015-03-12 19:24:26 +00:00
Santos Cordon
56027514f3 Do not hide any call log entries when they are added.
When a call log entry is added, and it's phone account does not match a
currently registered one, we set it to hidden.  This code was built for
the calllog restore case where call log entries would be hidden when
added if the original phone account wasn't also
present on the new device (where the restore is being performed).

We no longer do that so we're removing the code that sets any call log
entry to hidden.

Change-Id: I26ee27369e94c73446f7553f84cd4d8d4f2ff658
2015-03-12 11:55:32 -07:00
Filip Gruszczynski
c6ee744a90 Merge "Allow polling for WindowInsets." 2015-03-12 15:12:45 +00:00
Clara Bayarri
f84a9724f1 Move the "Replace" popup option to the Text Selection ActionMode.
As a first step in unifying the cut/copy/paste ActionMode in Editor
with the paste/replace popup, I'm moving the replace option to
the CAB ActionMode. Paste is already there, so for now all options
are together.

Missing things to address in upcoming CLs:
- Invoke the ActionMode in all cases where the popup shows up now,
ensuring only the options that are currently available show up.
- Get rid of the current popup
- Make the ActionMode a floating toolbar (pending feature completion)
- Define a keyboard shortcut for replace?

Note that since the ActionMode still shows up in the ActionBar and
replace has no icon it now appears as text and takes up lots of
space. This will improve when we can switch to using a floating
toolbar.

Change-Id: Ib6b60bae9b58e4db96b9c4cee556e19d3f1bb466
2015-03-12 10:31:11 +00:00
Lorenzo Colitti
b6b9fe216d am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."
* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
  Remove dead code, mostly DataStateTracker.
2015-03-12 07:38:50 +00:00
Lorenzo Colitti
2f196e6c81 Merge "Remove dead code, mostly DataStateTracker." 2015-03-12 07:27:27 +00:00
Jim Miller
216ce5d7b2 Merge "Add rename support to FingerprintManager" 2015-03-12 01:20:05 +00:00
Jim Miller
99d6019bea Add rename support to FingerprintManager
Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1
2015-03-11 18:17:55 -07:00
Andreas Gampe
26c95085b3 am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"
* commit 'cdd3fb5cdb9be8ae087c6d0fef2a545fca1c4205':
  Extracted a separate class to run dexopt on packages
2015-03-11 23:23:06 +00:00
Fyodor Kupolov
7487657ee9 Extracted a separate class to run dexopt on packages
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.

This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.

(cherry picked from commit eeea67b8c3)

Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-03-11 16:03:41 -07:00
Jeff Brown
a34a3bdcbf Update ParcelFileDescriptor to use non-blocking I/O.
Avoids spinning up a thread just to watch a file descriptor.

Bug: 10349083
Change-Id: I814cb252f075d7a162e1286bbfd1dbec28d17796
2015-03-11 15:37:21 -07:00
Jeff Brown
dc3eb4bf91 Add support for non-blocking I/O with Looper.
Bug: 10349083
Change-Id: I4a94b1eac53df57c05103913bd593d92b1e062d7
2015-03-11 15:00:35 -07:00
Jeff Brown
803c2affcb Expose some useful methods on Looper and clean up docs.
Change-Id: I40796c3ba07d3c50043da56e835f11fbf9852d30
2015-03-11 15:00:35 -07:00
Jeff Brown
3d4e7efe37 Move sync barrier methods into MessageQueue.
The methods were previously defined on Looper but on reflection
they actually make more sense on the MessageQueue instead since
the Looper class is primarily concerned with thread lifecycle
rather than the actual messages themselves.

Change-Id: Iff356b94754fc9960774fa17e3eec9604229cba6
2015-03-11 15:00:34 -07:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
2015-03-11 15:00:34 -07:00
Filip Gruszczynski
954289d9a9 Allow polling for WindowInsets.
Change-Id: I36feb2403b1bcf6de5d8808734c46999a38e7403
2015-03-11 14:11:58 -07:00