Commit Graph

70166 Commits

Author SHA1 Message Date
Clara Bayarri
6b9f24caff am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
* commit 'ae0940fe754b7aba552b4a5cd616df052606ccd1':
  Update the PROCESS_TEXT action javadoc to include types
2015-05-22 15:20:19 +00:00
Erik Kline
eb7e4048d3 am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev
* commit '2dcba49caf114dd24ffc1c26a11683c5cb21e3ff':
  Notify only on loss of provisioning.
2015-05-22 15:20:00 +00:00
Keisuke Kuroyanagi
3e7965f71c am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit '1733bd3defde7818940d72dac95bb18fb8d70b22':
  Fix: Insertion handle can be moved just by tapping.
2015-05-22 15:19:54 +00:00
Jim Miller
c1ee7f454f am b0eec328: Merge "Fix type-o in fingerprint string messages." into mnc-dev
* commit 'b0eec3288fc84fd5118be15004e46e27e5e584c1':
  Fix type-o in fingerprint string messages.
2015-05-22 15:19:40 +00:00
Clara Bayarri
ae0940fe75 Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 2015-05-22 10:24:57 +00:00
Erik Kline
2dcba49caf Merge "Notify only on loss of provisioning." into mnc-dev 2015-05-22 04:22:04 +00:00
Erik Kline
b1eebaeb92 Notify only on loss of provisioning.
Lots of code refactoring, include:
    - no longer watch for on-link proxies (only routers and DNS servers)
    - keep track of NUD state of neighbors of interest

Bug: 18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397
2015-05-22 13:03:08 +09:00
Keisuke Kuroyanagi
1733bd3def Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 2015-05-22 02:28:26 +00:00
Jim Miller
8701b5a0fa Fix type-o in fingerprint string messages.
Fixes bug 19561423

Change-Id: I1f7d88884d551b6b1250455cf3ff9496adf34263
2015-05-21 18:59:10 -07:00
Dianne Hackborn
c60f010edc am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit '8b20cdb27bc5b4c433c4fc650203be9a25842bbd':
  Add API to track usage time of apps.
2015-05-22 01:25:25 +00:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Selim Gurun
53d3e8c93d am 95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '95821eeabc1d6ae07ed2c3e6763f17473fb32ae3':
  Clean remaining API related issues.
2015-05-22 01:12:03 +00:00
Selim Gurun
95821eeabc Merge "Clean remaining API related issues." into mnc-dev 2015-05-22 01:02:14 +00:00
Selim Gurun
98fe09cba0 Clean remaining API related issues.
Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
2015-05-21 17:56:58 -07:00
Filip Gruszczynski
b0edb78e5c am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit '91e5b0f598f19499e55dcb8f0243b430e3c1ee4f':
  Support for devices with a chin.
2015-05-22 00:12:55 +00:00
Filip Gruszczynski
91e5b0f598 Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 2015-05-22 00:02:48 +00:00
Dianne Hackborn
b5a380d409 Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
2015-05-21 16:45:29 -07:00
Craig Mautner
4c20f59f76 am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '15dddf38912507e54b29e90cd0e8b0cd1335ebd6':
  For getHomeActivity() only return current user.
2015-05-21 23:45:26 +00:00
Craig Mautner
15dddf3891 Merge "For getHomeActivity() only return current user." into mnc-dev 2015-05-21 23:40:27 +00:00
Craig Mautner
db49fec8aa For getHomeActivity() only return current user.
Previously getHomeActivity() returned the topmost home activity
independent of which user was currently running. That defeated the
purpose of the method. This fix returns the home activity of the
current user or null if one has not yet been created.

Also remove some cruft that accumulated.

Fixes bug 21055376.

Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
2015-05-21 15:33:30 -07:00
Nancy Chen
3dd59bfb69 am 769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit '769832d11163abaa8a355650e796c2e39d7e0f3d':
  Fix phone account component name for voicemail status entries.
2015-05-21 22:14:06 +00:00
Nancy Chen
769832d111 Merge "Fix phone account component name for voicemail status entries." into mnc-dev 2015-05-21 22:01:34 +00:00
Yohei Yukawa
9360da997e am c0a9cd44: Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
* commit 'c0a9cd440db7a2881baf5f970eb78aabc11614e3':
  Do not clear IMM#mCurRootView in IMM#finishInputLocked().
2015-05-21 22:01:33 +00:00
Yohei Yukawa
c0a9cd440d Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev 2015-05-21 21:47:36 +00:00
Yohei Yukawa
0f3a99d837 Do not clear IMM#mCurRootView in IMM#finishInputLocked().
This is a follow up CL for I219394178e4172bc47864297f1418e677dba.

As explained in the commit message of I219394178e4172bc47864297f,
IMM#mCurRootView needs to be synchronized with the actual window
focus more precisely to fix Bug 20820914. Hence we should not
clear IMM#mCurRootView in IMM#finishInputLocked() anymore.
Ideally this CL should have been included in the previous CL.

Manually tested following scenarios.
- Repro steps in Bug 6413553.  Made sure that IMM#mCurRootView
  is cleared after switching back from the current application to
  the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
  that LatinIME works fine when switching text fields.  This is
  non-trivial because android.webkit.FindActionModeCallback is
  changed in the previous CL I219394178e4172bc47864297f1418e677db.
- Repro steps in Bug 21144633.  Made sure that we can enter
  recipient's name in the messaging app.

This CL depends on I219394178e4172bc47864297f1418e677dba25e5.

Bug: 20820914
Change-Id: Id6afc8fc64512225578c62557b96c7dc2e969adf
2015-05-21 21:34:07 +00:00
Christopher Tate
529f09251b am 7ca242e0: Merge "Close race condition in binderDied()" into mnc-dev
* commit '7ca242e0b4f4abcf2f726ec3c45e3fed2a289c16':
  Close race condition in binderDied()
2015-05-21 20:38:52 +00:00
Christopher Tate
7ca242e0b4 Merge "Close race condition in binderDied()" into mnc-dev 2015-05-21 20:27:12 +00:00
Nancy Chen
4924a31b18 Fix phone account component name for voicemail status entries.
Currently was using toString(), switch to "flattenToString" so it is
consistent with the call log.

Bug: 20954214

Change-Id: Ia9ed67bf463e4a2d4d9a02e00243d49238be17fe
2015-05-21 13:05:41 -07:00
Leon Scroggins III
1d5b35d465 am aba3ecb9: Merge "Fix overflow in NinePatchImpl." into mnc-dev
* commit 'aba3ecb976cacd7c92fe8f8afae20d112781d68e':
  Fix overflow in NinePatchImpl.
2015-05-21 19:14:09 +00:00
Leon Scroggins III
aba3ecb976 Merge "Fix overflow in NinePatchImpl." into mnc-dev 2015-05-21 19:05:46 +00:00
Eino-Ville Talvala
d301a66b0d am 779d43a7: Merge "Camera2: Fix spelling mistake" into mnc-dev
* commit '779d43a75b7047ea2d7b5040a955d04fe6006cff':
  Camera2: Fix spelling mistake
2015-05-21 18:18:59 +00:00
Eino-Ville Talvala
779d43a75b Merge "Camera2: Fix spelling mistake" into mnc-dev 2015-05-21 18:15:30 +00:00
Eino-Ville Talvala
3df98a20a0 am 842568ec: Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
* commit '842568ecebfb5bf6cabd7a7eabd8e8fa259dab72':
  Camera2: Fix CaptureRequest @see links
2015-05-21 18:14:10 +00:00
Eino-Ville Talvala
bd7f34f151 Camera2: Fix spelling mistake
Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310
2015-05-21 11:10:51 -07:00
Eino-Ville Talvala
842568eceb Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev 2015-05-21 18:09:40 +00:00
Chad Brubaker
0d4680130f am 431eac49: Merge "Cleanup Keystore API" into mnc-dev
* commit '431eac49aab7924c41c226cc8293c6fa351b21c6':
  Cleanup Keystore API
2015-05-21 17:35:13 +00:00
Clara Bayarri
aadd31ffe2 am b5611f55: Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
* commit 'b5611f555dc7c05028561dd38920d760d03846a2':
  Update the documentation for ActionMode.Callback2#onGetContentRect
2015-05-21 17:35:08 +00:00
Chad Brubaker
431eac49aa Merge "Cleanup Keystore API" into mnc-dev 2015-05-21 17:26:45 +00:00
Clara Bayarri
b5611f555d Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev 2015-05-21 17:24:14 +00:00
Clara Bayarri
92c8e6f4a3 Update the PROCESS_TEXT action javadoc to include types
Bug: 21343771
Change-Id: If1d64ba121555863022cecc7a7b3d94c866e8715
2015-05-21 17:58:27 +01:00
Clara Bayarri
e95cc176bb Update the documentation for ActionMode.Callback2#onGetContentRect
Received feedback from a team that it was not clear what the rect
had to include.

Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
2015-05-21 17:45:19 +01:00
Paul McLean
65522bd5a3 am d6c3404f: Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev
* commit 'd6c3404f597b4ea12c56554ab509e227f9722a77':
  Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
2015-05-21 16:28:34 +00:00
Eric Laurent
60574a02d8 am 97de0c9a: Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
* commit '97de0c9a29f76f936e1d93f9031e178b56af514f':
  AudioService: indicate system ready to AudioFlinger
2015-05-21 16:22:36 +00:00
Paul McLean
d6c3404f59 Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev 2015-05-21 16:21:48 +00:00
Leon Scroggins III
462dd01046 Fix overflow in NinePatchImpl.
Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().

BUG:20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8
2015-05-21 12:20:26 -04:00
Paul McLean
cef696e8b4 Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
2015-05-21 09:16:40 -07:00
Eric Laurent
97de0c9a29 Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev 2015-05-21 16:13:04 +00:00
Baligh Uddin
7261a90c12 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:20:22 +00:00
Erik Kline
11b5ee0541 am cd7ed16f: LinkProperties function to compare provisioning and remove DNS servers
* commit 'cd7ed16f00d243568e3b73b7fc7f0f94cfebe8ce':
  LinkProperties function to compare provisioning and remove DNS servers
2015-05-21 11:57:39 +00:00
Erik Kline
cd7ed16f00 LinkProperties function to compare provisioning and remove DNS servers
Adds:
    - enum ProvisioningChange
    - LinkProperties#compareProvisioning()
          return a ProvisioningChange value describing the delta in
          provisioning between two LinkProperties objects
    - LinkProperties#removeDnsServer()
    - make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()

Bug: 18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
2015-05-21 20:43:47 +09:00