222198 Commits

Author SHA1 Message Date
John Reck
f7aefcaf30 Merge "Fix flickering issue" 2015-11-12 23:53:46 +00:00
Sanket Padawe
ccbe7383e6 Don't allow contact sharing by default for device not recognized as carkit.
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit 07533dbffff5551ad4c58852b5856f57d7da6801)
2015-11-12 23:53:42 +00:00
Sanket Padawe
5b6ad87630 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 2015-11-12 23:53:25 +00:00
John Reck
f3fed8e576 Fix flickering issue
Bug: 25411780

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

Change-Id: I1ec636bc811a85eb2dc4f8c91562dc81b6261355
2015-11-12 15:52:06 -08:00
Casey Dahlin
376d5f350c Merge "Add hidden support for arrays of raw file descriptors" 2015-11-12 23:50:05 +00:00
Chong Zhang
66ed4c6383 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
2015-11-12 15:44:10 -08:00
Siyamed Sinir
386248f3c9 Merge "TextView.append() honors autoLink attribute" 2015-11-12 23:42:39 +00:00
Mark Salyzyn
c954fde0b6 jni: is loggable speedup, not within signal
Speedup by telling __android_is_loggable interface it will not
be called within a signal handler. This saves two system calls.

Bug: 25563384
Change-Id: Ib8188641c8c76e5aa848476da98596be6b8e5040
2015-11-12 15:40:51 -08:00
Joe LaPenna
62a08c439e 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
2015-11-12 23:29:47 +00:00
Joe LaPenna
0325b1324b 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.
2015-11-12 23:27:43 +00:00
Siyamed Sinir
a0db63f6ef 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
2015-11-12 15:25:31 -08:00
Joe LaPenna
76e30f26af 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
2015-11-12 23:22:32 +00:00
Joe LaPenna
ddf77e14e5 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.
2015-11-12 23:21:09 +00:00
Joe LaPenna
4d93d122bd 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
2015-11-12 23:14:29 +00:00
Joe LaPenna
2d43dd3c0e 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.
2015-11-12 23:13:01 +00:00
Deepanshu Gupta
b39ca7fa47 Improve error reporting on Exceptions in fw views. am: d30c141a2d
am: e0c9dd1b4f

* commit 'e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49':
  Improve error reporting on Exceptions in fw views.
2015-11-12 23:12:59 +00:00
Chad Brubaker
2b91bb8c0d Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-12 23:11:26 +00:00
Chad Brubaker
b0efdda86c Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9 am: 8f45b48757
am: 35e8a31bfa

* commit '35e8a31bfabfecfda738b4f26960da0ea245dc42':
  Support X509TrustManagerExtensions methods
2015-11-12 23:10:58 +00:00
Chad Brubaker
ca209943ac Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-12 23:09:53 +00:00
Chad Brubaker
3b3c19f9f2 Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
am: cd03475fc4

* commit 'cd03475fc44ed52939e836b8c3a9426691beedd8':
  Use duck typing in X509TrustManagerExtensions
2015-11-12 23:09:05 +00:00
Joe LaPenna
516ac154e1 Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev 2015-11-12 23:08:48 +00:00
Joe LaPenna
6915d809e8 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev 2015-11-12 23:08:42 +00:00
Chad Brubaker
e738edfe62 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-12 23:08:22 +00:00
Chad Brubaker
e33f81f81c Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2
am: cd03475fc4

* commit 'cd03475fc44ed52939e836b8c3a9426691beedd8':
  Use duck typing in X509TrustManagerExtensions
2015-11-12 23:07:20 +00:00
Philip P. Moltmann
d86e8d813b Merge "Do not disable the add printer icon and have special empty view if no print services are enabled" 2015-11-12 23:07:04 +00:00
Svetoslav Ganov
15ba8bfac2 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
2015-11-12 23:03:52 +00:00
Filip Gruszczynski
b38b0003e2 Merge "Fix recents to freeform animation." 2015-11-12 23:02:38 +00:00
Chong Zhang
d04690878d Merge "Fixes for touch exclusion region" 2015-11-12 22:58:52 +00:00
Vinit Deshpande
794395465b Re-enable wifi firmware debugging
This will be enabled till we are ready to ship
devices again.

Change-Id: I0440ebd9482412d538b1cdb7c768c8e238bea269
2015-11-12 14:45:15 -08:00
Deepanshu Gupta
e0c9dd1b4f Improve error reporting on Exceptions in fw views.
am: d30c141a2d

* commit 'd30c141a2dee881fd83e1415a50161def1acf227':
  Improve error reporting on Exceptions in fw views.
2015-11-12 22:36:00 +00:00
Filip Gruszczynski
fe9823f64c 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
2015-11-12 14:35:59 -08:00
Adam Lesinski
fb48d292d9 AAPT2: Add support for overlays when merging resources
Change-Id: Iea9e41123cf89e3cfba7eb6bea89def56dee8093
2015-11-12 14:26:29 -08:00
Casey Dahlin
2f974b252f 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>
2015-11-12 14:13:15 -08:00
Deepanshu Gupta
d30c141a2d 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
2015-11-12 13:56:14 -08:00
Fyodor Kupolov
1682dad7ed Moved system user apps whitelisting to PM
Previously applications where uninstalled for the system user at a later stage
in a boot process, when PM has already been initialized and registered as
a service. This was causing a flood of PACKAGE_REMOVED broadcasts.

Applications are now uninstalled at an earlier stage, when PM hasn't been
registered. Packages can simply be marked as not installed and broadcast
can be skipped.

Bug: 25626819
Change-Id: Ib64e7c45619809b0efb99cc566a9a2120ed48cd3
2015-11-12 13:48:18 -08:00
Filip Gruszczynski
f6d8e9e85f 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
2015-11-12 13:39:20 -08:00
Chad Brubaker
2bd2eb33c0 Dedupe trust anchors
When getting trust anchors we need to dedup them based on the
certificate to avoid having multiple trust anchors with the same cert
but different pin override behavior. If there are multiple trust anchors
with the same cert, the trust anchor which overrides pins wins.

Change-Id: Ida31f2551f56997418b8b091bb2598c5593cb069
2015-11-12 13:13:45 -08:00
Chris Craik
9fded232a9 Recycle OffscreenBuffers
Change-Id: Ia2e219026f211a5308ecf8209c5f986bb888aadd
2015-11-12 13:05:35 -08:00
Chong Zhang
d8ceb85512 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
2015-11-12 13:01:17 -08:00
Philip P. Moltmann
953639cb82 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
2015-11-12 11:48:09 -08:00
Chad Brubaker
35e8a31bfa Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9
am: 8f45b48757

* commit '8f45b487570b5c24eba3b4065f17650e6eb1fd7f':
  Support X509TrustManagerExtensions methods
2015-11-12 19:43:00 +00:00
Chad Brubaker
cd03475fc4 Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d
am: a26cafc2b2

* commit 'a26cafc2b2f072086aba2da0f5651fc9af5e6486':
  Use duck typing in X509TrustManagerExtensions
2015-11-12 19:41:41 +00:00
Chad Brubaker
8f45b48757 Merge "Support X509TrustManagerExtensions methods"
am: b324fb18d9

* commit 'b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
  Support X509TrustManagerExtensions methods
2015-11-12 19:34:52 +00:00
Chad Brubaker
a26cafc2b2 Merge "Use duck typing in X509TrustManagerExtensions"
am: 9c3982f75d

* commit '9c3982f75da19e2c0e146e7f251514a44412da0c':
  Use duck typing in X509TrustManagerExtensions
2015-11-12 19:33:31 +00:00
Chad Brubaker
b324fb18d9 Merge "Support X509TrustManagerExtensions methods" 2015-11-12 19:28:54 +00:00
Chad Brubaker
9c3982f75d Merge "Use duck typing in X509TrustManagerExtensions" 2015-11-12 19:28:21 +00:00
Bart Sears
8b8be50c64 Merge "Revert "Ensuring that fast-alt tab works from Home as well as other apps."" 2015-11-12 19:21:11 +00:00
Bart Sears
0c22429bfa Revert "Ensuring that fast-alt tab works from Home as well as other apps."
This reverts commit 55ff9de8aed998468caf320a3b7ecb7407e721e1.

Change-Id: I37213ea9bbd43a83835a9de6f873ccd1b549ad17
2015-11-12 19:20:31 +00:00
Dianne Hackborn
7a7619cc9e Merge "Work on issue #25467052: System lagged out" 2015-11-12 19:14:56 +00:00
Jason Monk
22f19fb9cb Merge "SettingsLib Drawer: Listen to theme about actionbar" 2015-11-12 18:55:09 +00:00