OSDN Git Service

android-x86/frameworks-base.git
8 years agoAdds new method to update existing documents in MtpDatabase.
Daichi Hirono [Tue, 10 Nov 2015 03:52:59 +0000 (12:52 +0900)]
Adds new method to update existing documents in MtpDatabase.

BUG=25162822

Change-Id: I7aa63fc272aa7b57d6a9672565f842774e898a00

8 years agoMerge "Handle shift+arrow correctly in single select mode."
Steve McKay [Fri, 13 Nov 2015 03:36:19 +0000 (03:36 +0000)]
Merge "Handle shift+arrow correctly in single select mode."

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 03:01:03 +0000 (03:01 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 am: 9752605815
am: 69c1bf1de0

* commit '69c1bf1de03037ac75bf0e21dc83b0d7142a0980':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:55:08 +0000 (02:55 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1
am: 9752605815

* commit '9752605815ee8956e855c468d341e9f18031c53e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:48:52 +0000 (02:48 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5
am: d80d24f5b1

* commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:41:55 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:41:51 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 am: 7336557937
am: 0d9b625236

* commit '0d9b62523697f1f97e7d16ee82b59ad3b48c1eb9':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:35:52 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5
am: 7336557937

* commit '73365579374d1460aca6abd05dbbc2e1417dee6f':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:35:51 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b
am: c9eb8b4367

* commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:29:50 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90
am: ffffcf14c5

* commit 'ffffcf14c58f9795bda802d75308332d0bb49dfe':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:29:47 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:23:37 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:16:19 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc
am: af5c9f809c

* commit 'af5c9f809cf7bbb890036a6411504a92e0d507ca':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db...
Matthew Williams [Fri, 13 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE

8 years agoMerge "AudioService: add a missing call to setSystemAudioMute"
Jae Seo [Fri, 13 Nov 2015 01:27:40 +0000 (01:27 +0000)]
Merge "AudioService: add a missing call to setSystemAudioMute"

8 years agoMerge "Drop binder identity before setting widget provider refresh alarm"
Chris Tate [Fri, 13 Nov 2015 01:04:15 +0000 (01:04 +0000)]
Merge "Drop binder identity before setting widget provider refresh alarm"

8 years agoMerge "Fix wrong dock stack bounds after rotation."
Filip Gruszczynski [Fri, 13 Nov 2015 00:35:57 +0000 (00:35 +0000)]
Merge "Fix wrong dock stack bounds after rotation."

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Fri, 13 Nov 2015 00:26:54 +0000 (00:26 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 am: 4f822bbf2a am: 761af3d27d
am: c9d033a71a

* commit 'c9d033a71afc263c0e493d33e555c3134f665bfb':
  Don't allow contact sharing by default for device not recognized as carkit.

8 years agoDrop binder identity before setting widget provider refresh alarm
Christopher Tate [Fri, 13 Nov 2015 00:21:05 +0000 (16:21 -0800)]
Drop binder identity before setting widget provider refresh alarm

Bug 25607336

Change-Id: I645b79c01206baa548d1d58cf9712ac1768e3b5b

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Fri, 13 Nov 2015 00:17:13 +0000 (00:17 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 am: 4f822bbf2a
am: 761af3d27d

* commit '761af3d27d40488d46a35a0c0c421a81fdd46cc4':
  Don't allow contact sharing by default for device not recognized as carkit.

8 years agoMerge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c am:...
Casey Dahlin [Fri, 13 Nov 2015 00:17:12 +0000 (00:17 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c am: 7a38be6112
am: 2c19dbeff5

* commit '2c19dbeff5ef15aaa6e4bfb23dc1fb44631e5036':
  Add hidden support for arrays of raw file descriptors

8 years agoMerge "Disallow DA to reset password, also fix all DO checks"
Makoto Onuki [Fri, 13 Nov 2015 00:13:26 +0000 (00:13 +0000)]
Merge "Disallow DA to reset password, also fix all DO checks"

8 years agoDisallow DA to reset password, also fix all DO checks
Makoto Onuki [Wed, 11 Nov 2015 20:40:15 +0000 (12:40 -0800)]
Disallow DA to reset password, also fix all DO checks

Now pure DA (not PO, not DO) aren't allowed to change the password
if one is already set.

Also update "isDeviceOwner" check and make sure we always take
user-id into account.  If one really wishes to check the package name
only, then use getgetDeviceOwner() instead.

Also change the enforceNotManagedProfile() check to what's more
generic in the FBE world.

Bug 25645900
Bug 25547523
Bug 25643916

Change-Id: I588ecf9452fe3acc1fb0b4ca0457ad662382fcd2

8 years agoMerge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c
Casey Dahlin [Fri, 13 Nov 2015 00:07:48 +0000 (00:07 +0000)]
Merge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c
am: 7a38be6112

* commit '7a38be61124fb1d75ed73cdd4050ba25047d2b03':
  Add hidden support for arrays of raw file descriptors

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Fri, 13 Nov 2015 00:07:47 +0000 (00:07 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630
am: 4f822bbf2a

* commit '4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
  Don't allow contact sharing by default for device not recognized as carkit.

8 years agoMerge "Refactoring: deduplicate surface bounds calculation."
Filip Gruszczynski [Fri, 13 Nov 2015 00:05:24 +0000 (00:05 +0000)]
Merge "Refactoring: deduplicate surface bounds calculation."

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Thu, 12 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
am: 5b6ad87630

* commit '5b6ad87630756751471f7224672328d955c8f2fb':
  Don't allow contact sharing by default for device not recognized as carkit.

8 years agoMerge "Add hidden support for arrays of raw file descriptors"
Casey Dahlin [Thu, 12 Nov 2015 23:57:58 +0000 (23:57 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"
am: 376d5f350c

* commit '376d5f350c6618d915338a9927b5d0f5fb61eba8':
  Add hidden support for arrays of raw file descriptors

8 years agoMerge "Fix lost window warning"
Chong Zhang [Thu, 12 Nov 2015 23:54:33 +0000 (23:54 +0000)]
Merge "Fix lost window warning"

8 years agoMerge "Fix flickering issue"
John Reck [Thu, 12 Nov 2015 23:53:46 +0000 (23:53 +0000)]
Merge "Fix flickering issue"

8 years agoMerge "Don't allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Thu, 12 Nov 2015 23:53:25 +0000 (23:53 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev

8 years agoFix flickering issue
John Reck [Thu, 12 Nov 2015 23:50:56 +0000 (15:50 -0800)]
Fix flickering issue

Bug: 25411780

Partial-revert for now, reopened b/22565656 to
deal with the memory use in a followup

Change-Id: I1ec636bc811a85eb2dc4f8c91562dc81b6261355

8 years agoMerge "Add hidden support for arrays of raw file descriptors"
Casey Dahlin [Thu, 12 Nov 2015 23:50:05 +0000 (23:50 +0000)]
Merge "Add hidden support for arrays of raw file descriptors"

8 years agoFix lost window warning
Chong Zhang [Thu, 12 Nov 2015 22:56:28 +0000 (14:56 -0800)]
Fix lost window warning

Mark activity window as invisible with window manager when it's
destroyed normally, to differentiate with the case where the app
crashed while visible.

bug: 25671369

Change-Id: I26d8df6b7e08fc5b65cd2c7aa432a3c5c8c5c7b3

8 years agoMerge "TextView.append() honors autoLink attribute"
Siyamed Sinir [Thu, 12 Nov 2015 23:42:39 +0000 (23:42 +0000)]
Merge "TextView.append() honors autoLink attribute"

8 years agoMerge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files...
Joe LaPenna [Thu, 12 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154e1  -s ours am: 4d93d122bd  -s ours
am: 76e30f26af  -s ours

* commit '76e30f26afe9b5971028ce10353da5f760f6738a':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files

8 years agoMerge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
Joe LaPenna [Thu, 12 Nov 2015 23:27:43 +0000 (23:27 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8  -s ours am: 2d43dd3c0e  -s ours
am: ddf77e14e5  -s ours

* commit 'ddf77e14e5d6a5b8aa61c0a9f82c099468129df7':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.

8 years agoTextView.append() honors autoLink attribute
Siyamed Sinir [Tue, 10 Nov 2015 23:34:29 +0000 (15:34 -0800)]
TextView.append() honors autoLink attribute

The append() method now checks if autoLink is set and adds the
URLSpans to given text before appending to the existing text.

Fixes https://code.google.com/p/android/issues/detail?id=1244
Fixes https://code.google.com/p/android/issues/detail?id=191353

Bug: 1404366
Bug: 25222125
Change-Id: I47a8beec9799e4f92ce266ceed41a634b7f7cc96

8 years agoMerge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files...
Joe LaPenna [Thu, 12 Nov 2015 23:22:32 +0000 (23:22 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154e1  -s ours
am: 4d93d122bd  -s ours

* commit '4d93d122bd8c9988cb4239d5aec7401f6ee3c54b':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files

8 years agoMerge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
Joe LaPenna [Thu, 12 Nov 2015 23:21:09 +0000 (23:21 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8  -s ours
am: 2d43dd3c0e  -s ours

* commit '2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.

8 years agoMerge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files...
Joe LaPenna [Thu, 12 Nov 2015 23:14:29 +0000 (23:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
am: 516ac154e1  -s ours

* commit '516ac154e16324d178fc1343293c4b1d5447ef2c':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files

8 years agoMerge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
Joe LaPenna [Thu, 12 Nov 2015 23:13:01 +0000 (23:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am: 6915d809e8  -s ours

* commit '6915d809e895d29411c0a687bff7fdd391509dc7':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.

8 years agoImprove error reporting on Exceptions in fw views. am: d30c141a2d
Deepanshu Gupta [Thu, 12 Nov 2015 23:12:59 +0000 (23:12 +0000)]
Improve error reporting on Exceptions in fw views. am: d30c141a2d
am: e0c9dd1b4f

* commit 'e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49':
  Improve error reporting on Exceptions in fw views.

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Chad Brubaker [Thu, 12 Nov 2015 23:11:26 +0000 (23:11 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Support X509TrustManagerExtensions methods" am: b324fb18d9 am: 8f45b48757
Chad Brubaker [Thu, 12 Nov 2015 23:10:58 +0000 (23:10 +0000)]
Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9 am: 8f45b48757
am: 35e8a31bfa

* commit '35e8a31bfabfecfda738b4f26960da0ea245dc42':
  Support X509TrustManagerExtensions methods

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Chad Brubaker [Thu, 12 Nov 2015 23:09:53 +0000 (23:09 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
Chad Brubaker [Thu, 12 Nov 2015 23:09:05 +0000 (23:09 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
am: cd03475fc4

* commit 'cd03475fc44ed52939e836b8c3a9426691beedd8':
  Use duck typing in X509TrustManagerExtensions

8 years agoMerge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files...
Joe LaPenna [Thu, 12 Nov 2015 23:08:48 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev

8 years agoMerge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
Joe LaPenna [Thu, 12 Nov 2015 23:08:42 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev

8 years agoMerge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesourc...
Chad Brubaker [Thu, 12 Nov 2015 23:08:22 +0000 (23:08 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

8 years agoMerge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
Chad Brubaker [Thu, 12 Nov 2015 23:07:20 +0000 (23:07 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
am: cd03475fc4

* commit 'cd03475fc44ed52939e836b8c3a9426691beedd8':
  Use duck typing in X509TrustManagerExtensions

8 years agoMerge "Do not disable the add printer icon and have special empty view if no print...
Philip P. Moltmann [Thu, 12 Nov 2015 23:07:04 +0000 (23:07 +0000)]
Merge "Do not disable the add printer icon and have special empty view if no print services are enabled"

8 years agoMerge "System crash fixed when turn off MagnificationGesture" am: 8f87949340 am:...
Svetoslav Ganov [Thu, 12 Nov 2015 23:03:52 +0000 (23:03 +0000)]
Merge "System crash fixed when turn off MagnificationGesture" am: 8f87949340 am: 1ff9f8ad50
am: af0596d317  -s ours

* commit 'af0596d3172ce9ccc98aa494d092cd146ce15b05':
  System crash fixed when turn off MagnificationGesture

8 years agoMerge "Fix recents to freeform animation."
Filip Gruszczynski [Thu, 12 Nov 2015 23:02:38 +0000 (23:02 +0000)]
Merge "Fix recents to freeform animation."

8 years agoMerge "Fixes for touch exclusion region"
Chong Zhang [Thu, 12 Nov 2015 22:58:52 +0000 (22:58 +0000)]
Merge "Fixes for touch exclusion region"

8 years agoImprove error reporting on Exceptions in fw views.
Deepanshu Gupta [Thu, 12 Nov 2015 22:36:00 +0000 (22:36 +0000)]
Improve error reporting on Exceptions in fw views.
am: d30c141a2d

* commit 'd30c141a2dee881fd83e1415a50161def1acf227':
  Improve error reporting on Exceptions in fw views.

8 years agoFix recents to freeform animation.
Filip Gruszczynski [Thu, 12 Nov 2015 22:09:26 +0000 (14:09 -0800)]
Fix recents to freeform animation.

We should use freeform animation spec not only when the task is already
freeform, but also when it is entering freeform.

Bug: 25669457
Change-Id: I30cba79a149183b0a8b9e1e4751a215cef6a490f

8 years agoAdd hidden support for arrays of raw file descriptors
Casey Dahlin [Thu, 5 Nov 2015 20:19:13 +0000 (12:19 -0800)]
Add hidden support for arrays of raw file descriptors

Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoImprove error reporting on Exceptions in fw views.
Deepanshu Gupta [Wed, 21 Oct 2015 00:29:44 +0000 (17:29 -0700)]
Improve error reporting on Exceptions in fw views.

When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.

Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).

Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728

8 years agoFix wrong dock stack bounds after rotation.
Filip Gruszczynski [Thu, 12 Nov 2015 21:39:20 +0000 (13:39 -0800)]
Fix wrong dock stack bounds after rotation.

When setting the stack bounds from the system UI we need depend on
DisplayInfo.logicalWidth/Height instead of DisplayMetrics.
DisplayMetrics have values adjusted for status bar and nav bar, but the
Activity Manager doesn't know about that. It expects the stack bounds to
use full display size.

Bug: 25665425
Change-Id: Idf5f3192105b72686d1ad11fe4f42c894bb87fbe

8 years agoRecycle OffscreenBuffers
Chris Craik [Thu, 12 Nov 2015 00:42:34 +0000 (16:42 -0800)]
Recycle OffscreenBuffers

Change-Id: Ia2e219026f211a5308ecf8209c5f986bb888aadd

8 years agoFixes for touch exclusion region
Chong Zhang [Wed, 11 Nov 2015 22:53:41 +0000 (14:53 -0800)]
Fixes for touch exclusion region

- Evaluate touch exclusion region on per-task basis, instead of per
  window. Smallest unit for exclusion is Task, if task has more than
  one app window, we still need to use the visible area of the task
  to do focus transfer properly.

- Only add back the touch region for focused task after all tasks
  are processed for eclusion, otherwise the focused area could be
  removed from exclusion incorrectly.

- Skip app windows that's exiting or hidden.

bug: 25494928

Change-Id: I972ba2149431557e7420b1095d9496a6cd821bdb

8 years agoDo not disable the add printer icon and have special empty view if no
Philip P. Moltmann [Wed, 11 Nov 2015 23:30:16 +0000 (15:30 -0800)]
Do not disable the add printer icon and have special empty view if no
print services are enabled

The add printer icon is always visible as this is used for both adding
a printer and adding addition print services

We have three different empty views now:
1. No print services
2. No printers found (not search filter set)
3. No printers found (search filter set)

Bug: 24132367
Change-Id: Ic30812b60986f1e0f023488cefc6aa901ce20824

8 years agoMerge "Support X509TrustManagerExtensions methods" am: b324fb18d9
Chad Brubaker [Thu, 12 Nov 2015 19:43:00 +0000 (19:43 +0000)]
Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9
am: 8f45b48757

* commit '8f45b487570b5c24eba3b4065f17650e6eb1fd7f':
  Support X509TrustManagerExtensions methods

8 years agoMerge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d
Chad Brubaker [Thu, 12 Nov 2015 19:41:41 +0000 (19:41 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d
am: a26cafc2b2

* commit 'a26cafc2b2f072086aba2da0f5651fc9af5e6486':
  Use duck typing in X509TrustManagerExtensions

8 years agoMerge "Support X509TrustManagerExtensions methods"
Chad Brubaker [Thu, 12 Nov 2015 19:34:52 +0000 (19:34 +0000)]
Merge "Support X509TrustManagerExtensions methods"
am: b324fb18d9

* commit 'b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
  Support X509TrustManagerExtensions methods

8 years agoMerge "Use duck typing in X509TrustManagerExtensions"
Chad Brubaker [Thu, 12 Nov 2015 19:33:31 +0000 (19:33 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"
am: 9c3982f75d

* commit '9c3982f75da19e2c0e146e7f251514a44412da0c':
  Use duck typing in X509TrustManagerExtensions

8 years agoMerge "Support X509TrustManagerExtensions methods"
Chad Brubaker [Thu, 12 Nov 2015 19:28:54 +0000 (19:28 +0000)]
Merge "Support X509TrustManagerExtensions methods"

8 years agoMerge "Use duck typing in X509TrustManagerExtensions"
Chad Brubaker [Thu, 12 Nov 2015 19:28:21 +0000 (19:28 +0000)]
Merge "Use duck typing in X509TrustManagerExtensions"

8 years agoMerge "Revert "Ensuring that fast-alt tab works from Home as well as other apps.""
Bart Sears [Thu, 12 Nov 2015 19:21:11 +0000 (19:21 +0000)]
Merge "Revert "Ensuring that fast-alt tab works from Home as well as other apps.""

8 years agoRevert "Ensuring that fast-alt tab works from Home as well as other apps."
Bart Sears [Thu, 12 Nov 2015 19:20:31 +0000 (19:20 +0000)]
Revert "Ensuring that fast-alt tab works from Home as well as other apps."

This reverts commit 55ff9de8aed998468caf320a3b7ecb7407e721e1.

Change-Id: I37213ea9bbd43a83835a9de6f873ccd1b549ad17

8 years agoMerge "Work on issue #25467052: System lagged out"
Dianne Hackborn [Thu, 12 Nov 2015 19:14:56 +0000 (19:14 +0000)]
Merge "Work on issue #25467052: System lagged out"

8 years agoMerge "SettingsLib Drawer: Listen to theme about actionbar"
Jason Monk [Thu, 12 Nov 2015 18:55:09 +0000 (18:55 +0000)]
Merge "SettingsLib Drawer: Listen to theme about actionbar"

8 years agoSettingsLib Drawer: Listen to theme about actionbar
Jason Monk [Thu, 12 Nov 2015 15:52:21 +0000 (10:52 -0500)]
SettingsLib Drawer: Listen to theme about actionbar

Show it or not based on windowNoTitle.

Bug: 25567755
Change-Id: Ie1a6b79eb87dcc101bd76785df7c5330acc54603

8 years agoMerge "Ensuring that fast-alt tab works from Home as well as other apps."
Winson Chung [Thu, 12 Nov 2015 18:42:23 +0000 (18:42 +0000)]
Merge "Ensuring that fast-alt tab works from Home as well as other apps."

8 years agoMerge "Use array instead of vector for test data set"
Doris Liu [Thu, 12 Nov 2015 18:40:54 +0000 (18:40 +0000)]
Merge "Use array instead of vector for test data set"

8 years agoUse array instead of vector for test data set
Doris Liu [Thu, 12 Nov 2015 18:36:28 +0000 (10:36 -0800)]
Use array instead of vector for test data set

Change-Id: I1d3e94c52b8bf0842c21132507b5f55a136a255b

8 years agoMerge "Add shadow support to new reorderer/renderer"
Chris Craik [Thu, 12 Nov 2015 18:29:24 +0000 (18:29 +0000)]
Merge "Add shadow support to new reorderer/renderer"

8 years agoMerge "Prevent runtime restart on missing magnification spec accessors"
Alan Viverette [Thu, 12 Nov 2015 18:29:15 +0000 (18:29 +0000)]
Merge "Prevent runtime restart on missing magnification spec accessors"

8 years agoEnsuring that fast-alt tab works from Home as well as other apps.
Winson [Thu, 12 Nov 2015 17:32:10 +0000 (09:32 -0800)]
Ensuring that fast-alt tab works from Home as well as other apps.

Change-Id: I920fdd06d5b9e3e63d197dce5a366a4316361ed5

8 years agoMerge "Wire in the device owner info into the KeyguardStatusView"
Andrei Stingaceanu [Thu, 12 Nov 2015 18:12:44 +0000 (18:12 +0000)]
Merge "Wire in the device owner info into the KeyguardStatusView"

8 years agoWire in the device owner info into the KeyguardStatusView
Andrei Stingaceanu [Thu, 12 Nov 2015 12:15:56 +0000 (12:15 +0000)]
Wire in the device owner info into the KeyguardStatusView

Display the device owner information if it has been provisioned by
DPC via DevicePolicyManager, else fallback into displaying the
current user owner information (if set).

Change-Id: Ie915d6669ecac06bfa7b57079b9dcd0fac56df57

8 years agoPrevent runtime restart on missing magnification spec accessors
Alan Viverette [Thu, 12 Nov 2015 17:43:15 +0000 (12:43 -0500)]
Prevent runtime restart on missing magnification spec accessors

The spec property requires an accessible getter and setter. This code
will be removed in a following CL that refactors magnification spec
animation.

Change-Id: Ia8fecf98700d18e62ae30aa437b81b061c9a9542

8 years agoMerge "Deal correctly with suggested print attributes"
Philip P. Moltmann [Thu, 12 Nov 2015 17:17:30 +0000 (17:17 +0000)]
Merge "Deal correctly with suggested print attributes"

8 years agoMerge "Fix missing dock divider."
Filip Gruszczynski [Thu, 12 Nov 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix missing dock divider."

8 years agoRefactoring: deduplicate surface bounds calculation.
Filip Gruszczynski [Wed, 11 Nov 2015 21:46:04 +0000 (13:46 -0800)]
Refactoring: deduplicate surface bounds calculation.

This merges code from WindowStateAnimator.setSurfaceBoundariesLocked and
WindowStateAnimator.createSurfaceLocked. We calculate the final surface
size and position in both of these methods in very similar way. The
minor differences seem like small mistakes that aren't visible, because
they happen during surface creation and get fixed very soon after when
the boundaries are set.

Change-Id: I321cb17831888f97619b0cae73fdaf9cbbc762fb

8 years agoMerge "Removing hacks to delay app animations until window animations complete."
Winson Chung [Thu, 12 Nov 2015 16:42:20 +0000 (16:42 +0000)]
Merge "Removing hacks to delay app animations until window animations complete."

8 years agoMerge "Avoid configuration of callback being reset after relayout." am: cbcafde45e...
Wale Ogunwale [Thu, 12 Nov 2015 16:35:44 +0000 (16:35 +0000)]
Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e am: 0170fb8281
am: f98a6f4101

* commit 'f98a6f41019bf41d57d0681c2e1d6859f8704091':
  Avoid configuration of callback being reset after relayout.

8 years agoFix missing dock divider.
Filip Gruszczynski [Wed, 11 Nov 2015 23:58:03 +0000 (15:58 -0800)]
Fix missing dock divider.

When invisible the dock divider would have its bounds adjusted to size
0, 0 and that would be sent to Surface Flinger. When it becomes visible
we immediately adjust the size of the surface, but it's too late for
Surface Flinger and it returns wrong size to the renderer. By not
adjusting the dock divider bounds when it's invisible, Surface Flinger
will always hold good size. The position will be adjusted when the
divider gets visible.

Bug: 25612050

Change-Id: Iab0798d6545ae0f8b46eabfe7e4100079779bd06