Commit Graph

48153 Commits

Author SHA1 Message Date
Amith Yamasani
fa41be53ee am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
* commit '031f1bc9ee6d79591e4bf2c4c30d616e87fc6f6b':
  Add getPermissionGrantState method in device policy
2015-05-23 00:26:32 +00:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Yin-Chia Yeh
7247c6d10f am 5c4def8a: am 5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev
* commit '5c4def8acda8124da2637a590bcf4ee0cd2ecd3c':
  Camera: update available LSC map mode key type
2015-05-22 23:55:12 +00:00
Yin-Chia Yeh
5cf9d8ac94 Merge "Camera: update available LSC map mode key type" into mnc-dev 2015-05-22 23:40:33 +00:00
Yin-Chia Yeh
656931d36d Camera: update available LSC map mode key type
Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
2015-05-22 16:37:27 -07:00
Yin-Chia Yeh
bf1bc14d4c am d310d94f: am 9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev
* commit 'd310d94f77fcb2da8057cfd948cb2f453a1f2398':
  Camera2: update FpsRange requirement
2015-05-22 22:10:29 +00:00
Yin-Chia Yeh
9fbdc87422 Merge "Camera2: update FpsRange requirement" into mnc-dev 2015-05-22 20:57:08 +00:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
2015-05-22 13:55:57 -07:00
Yin-Chia Yeh
5855162f80 Camera2: update FpsRange requirement
Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
2015-05-22 13:50:10 -07:00
Adam Powell
aa66b15a43 am 369e6074: am 94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev
* commit '369e607472bd7341f2407cddee3a0079da862e2d':
  Restore app expectations around drawable visibility change timing
2015-05-22 20:17:15 +00:00
Adam Powell
94518a4c35 Merge "Restore app expectations around drawable visibility change timing" into mnc-dev 2015-05-22 19:48:54 +00:00
Dianne Hackborn
271e92c197 am da517da8: am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev
* commit 'da517da8d9292cf12465545528ad6e11bbc79d0a':
  Improve reporting to apps of transaction too large failures.
2015-05-22 19:17:36 +00:00
Dianne Hackborn
fa4d547d58 Merge "Improve reporting to apps of transaction too large failures." into mnc-dev 2015-05-22 18:52:41 +00:00
Chien-Yu Chen
5fd20f2131 am 6c474a7e: am f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev
* commit '6c474a7e915dad90d0c4f76c6bbc50f40020b506':
  Camera2: Implement toString() for camera2 params
2015-05-22 18:32:43 +00:00
Adam Powell
eb2b0af22c Restore app expectations around drawable visibility change timing
When we update drawable visibility has changed to be part of
View.onVisibilityChanged instead of an overload of
setVisibility. While this covers more cases that we were previously
missing, it also means that we now set drawable visibility from the
View constructor via the call chain view.setFlags to
view.onVisibilityChanged to drawable.setVisibility, resulting in us
passing a 'this' pointer all over before the object is fully
initialized. (i.e. a Bad Thing.)

In general we've gotten away with playing fast and loose with this
sort of thing as a part of view inflation - calling various non-final
setters that may invoke callbacks as needed rather than initializing
view fields directly. Unfortunately it also means that we can cause a
lot of hard to trace bugs and in the long run we should try to clean
up as much of it as we can.

In this case, some apps were expecting inflation to have finished
completely before any drawable visibility changed. If a view's
visibility changes but it's not attached to a window, does it make a
callback?

The fix: no. We won't dispatch onVisibilityChanged to detached views,
but we will dispatch it when a view becomes attached.

Also fix a bug where we could end up telling a view its visibility
changed to (INVISIBLE | GONE), which just doesn't make any sense.

Bug 20103422

Change-Id: Ifba54c36114e85cf64869afcca766c30d601a16c
2015-05-22 11:21:17 -07:00
Chris Craik
f657637933 am 36dd6e63: am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev
* commit '36dd6e63fe520666272af1f9784adc4a450112e3':
  Disable density scaling for HW canvas
2015-05-22 18:20:09 +00:00
Chien-Yu Chen
f5b1e39c2e Merge "Camera2: Implement toString() for camera2 params" into mnc-dev 2015-05-22 18:15:05 +00:00
Chris Craik
33416a9363 Merge "Disable density scaling for HW canvas" into mnc-dev 2015-05-22 17:57:08 +00:00
Chris Craik
9c08ee0f6c Disable density scaling for HW canvas
bug:20692121

Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990
2015-05-22 10:49:48 -07:00
Chien-Yu Chen
310f381eac Camera2: Implement toString() for camera2 params
Implement toString() for BlackLevelPattern, InputConfiguration, and
StreamConfigurationMap.

Bug: 16899576
Change-Id: Ide1cf103f3282750653ce7bdc29c0b74920d4855
2015-05-22 10:40:21 -07:00
Fyodor Kupolov
5fbbd95454 am 13b61b29: am 96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev
* commit '13b61b293d89545b193f40535b8f10f10a5fb191':
  Use factory methods for RestrictionEntry
2015-05-22 16:46:07 +00:00
Clara Bayarri
28c5ef5fa1 am 6b9f24ca: am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
* commit '6b9f24caff303c11953ff1f9417cbff2e91bdb55':
  Update the PROCESS_TEXT action javadoc to include types
2015-05-22 16:38:52 +00:00
Erik Kline
00e53ba869 am eb7e4048: am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev
* commit 'eb7e4048d319cd65c1d927abd10a8637c39ff5fb':
  Notify only on loss of provisioning.
2015-05-22 16:38:46 +00:00
Keisuke Kuroyanagi
b53290085a am 3e7965f7: am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit '3e7965f71c1ab5c89034deed85c093d8a5843a92':
  Fix: Insertion handle can be moved just by tapping.
2015-05-22 16:38:41 +00:00
Fyodor Kupolov
96616a57f3 Merge "Use factory methods for RestrictionEntry" into mnc-dev 2015-05-22 16:21:20 +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
Dianne Hackborn
ad15bee4ff am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit 'c60f010edcb197451d087207b0c9527d74cff245':
  Add API to track usage time of apps.
2015-05-22 01:37:15 +00:00
Selim Gurun
7f34d973db am 53d3e8c9: am 95821eea: Merge "Clean remaining API related issues." into mnc-dev
* commit '53d3e8c93d3aec6f6ee9c9c759da3241fbaddb75':
  Clean remaining API related issues.
2015-05-22 01:24:48 +00:00
Dianne Hackborn
e5c4262109 Improve reporting to apps of transaction too large failures.
If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on.  Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
  it may include an additional message in it telling you how much
  data was in the parcel being sent, to help you understand why
  this happening.

- In all the framework code paths where we call to the system and
  may fail, convert these failures into a a runtime exception and
  rethrow them back to the app so that it will clearly get the
  above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
2015-05-21 18:19:50 -07: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
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
76173cc89f am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit 'b0edb78e5cfd793ff7848b14962f1cf7ca509eff':
  Support for devices with a chin.
2015-05-22 00:23:41 +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
Craig Mautner
f41e2e6391 am 4c20f59f: am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '4c20f59f76fc6a7c5c4dc3d6e3087395cf5686de':
  For getHomeActivity() only return current user.
2015-05-22 00:00:15 +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
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
d12eb3531c am 3dd59bfb: am 769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit '3dd59bfb69472b13835a336c36e53d6726b5977a':
  Fix phone account component name for voicemail status entries.
2015-05-21 22:28:51 +00:00
Yohei Yukawa
882dcd5a40 am 9360da99: am c0a9cd44: Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
* commit '9360da997eb4eb2202fa0a3115f0bcfb2c4950f9':
  Do not clear IMM#mCurRootView in IMM#finishInputLocked().
2015-05-21 22:13:01 +00:00
Fyodor Kupolov
f70c9346d6 Use factory methods for RestrictionEntry
As per API council request, factory methods should be used instead of using
boolean.

Bug: 21343772
Change-Id: Ia0889e46916f4ed7edb942217880cdf9c27771c2
2015-05-21 15:08:42 -07: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
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
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
Eino-Ville Talvala
eda458c4a5 am d301a66b: am 779d43a7: Merge "Camera2: Fix spelling mistake" into mnc-dev
* commit 'd301a66b0d6e549375401575e2461924cb4f731e':
  Camera2: Fix spelling mistake
2015-05-21 18:49:41 +00:00
Eino-Ville Talvala
88092fe1e2 am 3df98a20: am 842568ec: Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev
* commit '3df98a20a00cb638f9a3264866c7f104aeef3980':
  Camera2: Fix CaptureRequest @see links
2015-05-21 18:49:35 +00:00