Commit Graph

246497 Commits

Author SHA1 Message Date
Felipe Leme
6e412c20a0 Merge "Fixed wrong loop variable (AKA: I, Y U NO J?)" into nyc-dev
am: 4d33455c4f

* commit '4d33455c4f8a411472a92f18664917f2e4da0e06':
  Fixed wrong loop variable (AKA: I, Y U NO J?)

Change-Id: Id13b903e33ed89c5254eaf311378d69104d4a6f6
2016-04-29 00:18:06 +00:00
Adam Lesinski
98a418758d Merge "Add Complex XML Resources guide to docs" into nyc-dev 2016-04-29 00:13:42 +00:00
TreeHugger Robot
05be517fb7 Merge "ImageWallpaper: Only draw on valid surfaces" into nyc-dev 2016-04-29 00:13:23 +00:00
TreeHugger Robot
4d33455c4f Merge "Fixed wrong loop variable (AKA: I, Y U NO J?)" into nyc-dev 2016-04-29 00:11:42 +00:00
Jim Miller
9cd1a8f1d6 Merge "Clean up fingerprint enrollment API" into nyc-dev
am: 8d38894d1f

* commit '8d38894d1f6cb7a3f57aeff9fa396b20340f9079':
  Clean up fingerprint enrollment API

Change-Id: I58bdc0855bab7bfbe7057df9c666eeb43d400111
2016-04-28 23:53:42 +00:00
Jim Miller
8d38894d1f Merge "Clean up fingerprint enrollment API" into nyc-dev 2016-04-28 23:48:42 +00:00
Chong Zhang
e7b5f3dc04 Merge "Fix restoring surface for child windows" into nyc-dev
am: c56ca11611

* commit 'c56ca11611376a86e0d5791523e7e0ed04f990b6':
  Fix restoring surface for child windows

Change-Id: I494c387784f17a7e992c55732da073a145f3b808
2016-04-28 23:26:57 +00:00
Chong Zhang
c56ca11611 Merge "Fix restoring surface for child windows" into nyc-dev 2016-04-28 23:18:29 +00:00
Chong Zhang
b7b4a56a6e Fix restoring surface for child windows
Use allAppWindows instead of windows, as windows doesn't contain
any child windows, it causes the child windows to be not restored
until the child window does relayout.

bug: 28296945

Change-Id: I7d272e660752002c08349128c3958aa041979c34
2016-04-28 15:44:50 -07:00
Felipe Leme
6173185432 Fixed wrong loop variable (AKA: I, Y U NO J?)
BUG: 27366993
BUG: 28451218
Change-Id: I8455ada4194e7fc44ae7448e5cd763d22065fd2e
2016-04-28 15:37:20 -07:00
Jean-Michel Trivi
375baefa87 Merge "Additional alarm sounds for N" into nyc-dev
am: b97fdfa39a

* commit 'b97fdfa39afe0dd90ebfb821a839a509475fd47c':
  Additional alarm sounds for N

Change-Id: I56b79e04bf4a5f0555c13708f61a8e8d42ad0337
2016-04-28 22:24:10 +00:00
Adrian Roos
53560f1c8b ImageWallpaper: Only draw on valid surfaces
Previously, the wallpaper would draw even when
the surface had been destroyed, leading to
crashes.

Change-Id: I6465e832abb3bfd92495bca9b60dac474b35f6d6
Fixes: 28329816
2016-04-28 15:22:51 -07:00
Jean-Michel Trivi
b97fdfa39a Merge "Additional alarm sounds for N" into nyc-dev 2016-04-28 22:14:02 +00:00
Jim Miller
c12eca8b59 Clean up fingerprint enrollment API
The enrollment API was using userId and groupId interchangeably.
This cleanes up the interface to consistently use userId.

Partial fix for bug 28268635

Change-Id: I678e4b17a25f82c5cf17db49cd23f862be11667b
2016-04-28 15:12:53 -07:00
Philip P. Moltmann
3c757036a3 Delay callback from printerRegistry after Constr.
If the leader inside of the printer registry can immediately initalize
the callback is called in the same thread as the contructor is
executing. Hence in this case the mPrinterRegistry field is used before
written.

Change-Id: I45239d2792f6c31ec215ddb01131038882ff0136
2016-04-28 15:11:26 -07:00
Christopher Tate
98f1ff0558 Don't wedge full data backups by blocking the data consumer thread
In particular, don't ask the producer about error overrides when
it is still relying on the consumer to do its job first.  This
needs to be policy for *any* transport-side error condition, not
just the one that was previously handled safely.  Any transport-
initiated error "on the fly" means that the app-facing side of
the engine doesn't know to stop feeding data, and mustn't be
consulted with any blocking request.

We also now detect unexpected PACKAGE_REJECTED by the transport
after data streaming has begun, and translate that to the general
TRANSPORT_ERROR for correct handling down the line.

Bug 28399225
Bug 28375634

Change-Id: I613dc21bc9f2d23e6520eed6c3ac2e9dbc1d88dc
2016-04-28 15:07:31 -07:00
Nadia Benbernou
948627eeaa Add api to WearableExtender for setting and getting the dismissal id.
Bug:27696581

Change-Id: Idf37234a9fd1d54e2fab0a4d5bfab70bbb1a3ba5
2016-04-28 17:57:25 -04:00
Andrew Solovay
6919184a01 docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f am: 04893309eb am: f31c9f4e8c am: 6a5ce2914a
am: ce2dae9c16

* commit 'ce2dae9c1638706cf0a05172fb3752d6d0acbf5b':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: Ib50d1a6deeb2340cd2360f10a7ecc97a7f7a5f65
2016-04-28 21:25:21 +00:00
Sudheer Shanka
a2650a958b Move spinner_dropdown_restricted_item to Settings.
RestrictedDropdownPreference is in Settings and currently not
used by anything else, so corresponding layout
spinner_dropdown_restricted_item to Settings.

Bug: 28390118
Change-Id: I3a1b53dc80ba9329d6ffd40562db0c0587a34666
2016-04-28 14:24:04 -07:00
Andrew Solovay
ce2dae9c16 docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f am: 04893309eb am: f31c9f4e8c
am: 6a5ce2914a

* commit '6a5ce2914a0360cf08c6b49a9f3ef66ad9fe6a1c':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: I0874460d818d6c86fa95acf5075c46402c94b935
2016-04-28 21:23:06 +00:00
Andrew Solovay
6a5ce2914a docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f am: 04893309eb
am: f31c9f4e8c

* commit 'f31c9f4e8c606dcabad6eb63ac7801b77d1de328':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: Iff6598a73fcffdfc8d576d2722b4c434d0f0ce3f
2016-04-28 21:20:43 +00:00
Dongwon Kang
36e971e559 Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev
am: ddf44fc7ef

* commit 'ddf44fc7efac3e2ae25d07781230d3a73a786788':
  TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN

Change-Id: Ib5d5afc609ced882a40faea20bc8406e8f2868ea
2016-04-28 21:20:38 +00:00
Andrii Kulian
fa3991aae0 Fix crash loop when activity controller was set
If activity controller was set and application crashed - process was killed,
but records in task history were not erased and AM restarted crashed activity.
This caused crash loop if activity was crashing on every launch.

This CL handles app crash correctly in this case + lets AM handle
instrumentation test crash in ActivityManagerService#handleAppDiedLocked to
remove code duplication.

Bug: 28374171
Change-Id: Idf50d1e2cc784c0ae970aa290b82fe1eedd6d1fd
2016-04-28 14:18:37 -07:00
Andrew Solovay
f31c9f4e8c docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f
am: 04893309eb

* commit '04893309eb8abeb331fbc1fadac6d141dc2a4d63':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: I3b8c7eb3dc4d4761aba349b7dbecc1039ae5eb65
2016-04-28 21:18:19 +00:00
Dongwon Kang
ddf44fc7ef Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev 2016-04-28 21:17:32 +00:00
Andrew Solovay
04893309eb docs: Updated support library overview, CPd from mnc-mr-docs
am: dd3b48de2f

* commit 'dd3b48de2fd4c47d0e225f6fd5b81b73fafd3643':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: I33fe9708e9d34bba1720f7f210d89518ad39de0c
2016-04-28 21:16:02 +00:00
Andrew Solovay
22686de24a Merge "docs: Moving library docs out of /tools/ am: 7877f69ddd am: 6bbce8db4f am: 4290ad19e2" into nyc-dev
am: 37911f9954

* commit '37911f9954b600b6f9e4bcfe9e1d31be4b163cb0':
  docs: Moving library docs out of /tools/

Change-Id: I6f454f0d564911211960ff4c996ab8d5d554466f
2016-04-28 21:02:09 +00:00
Adrian Roos
b9d561c4e9 Merge "Show lockscreen wallpaper on SIM screens" into nyc-dev
am: f76b15057e

* commit 'f76b15057eb5b96f74fe90fed58525b4b5a0ec20':
  Show lockscreen wallpaper on SIM screens

Change-Id: If7cf52144260d1151f418cb18ae6114a13e9f8ba
2016-04-28 21:02:06 +00:00
Android Build Merger (Role)
37911f9954 Merge "docs: Moving library docs out of /tools/ am: 7877f69ddd am: 6bbce8db4f am: 4290ad19e2" into nyc-dev 2016-04-28 21:00:25 +00:00
Andrew Solovay
bc0b8ca0df docs: Moving library docs out of /tools/ am: 7877f69ddd am: 6bbce8db4f
am: 4290ad19e2

* commit '4290ad19e2b96887b88a08e8e39629b34d4d4117':
  docs: Moving library docs out of /tools/

Change-Id: I3f42ace3cce49c0d66cc51607c6b7bf182a445c2
2016-04-28 20:59:50 +00:00
Adrian Roos
f76b15057e Merge "Show lockscreen wallpaper on SIM screens" into nyc-dev 2016-04-28 20:57:27 +00:00
Andrew Solovay
4290ad19e2 docs: Moving library docs out of /tools/ am: 7877f69ddd
am: 6bbce8db4f

* commit '6bbce8db4fd9d4fe5d56fb7eb17793f0c8ac7294':
  docs: Moving library docs out of /tools/

Change-Id: I89594b6fc16e8d14aac5825f7f05b7cf928ffb69
2016-04-28 20:57:26 +00:00
Justin Klaassen
80dc63f673 Merge "Support view transformations when positioning floating CAB" into nyc-dev
am: 1fe7ed557d

* commit '1fe7ed557de90c6992f6d36a485cd63b651a51dd':
  Support view transformations when positioning floating CAB

Change-Id: Ibbb54ea2fee6ed68e35ab144a184c7dbfde0637f
2016-04-28 20:53:13 +00:00
Andrew Solovay
6bbce8db4f docs: Moving library docs out of /tools/
am: 7877f69ddd

* commit '7877f69ddd5f195829a54df256a0f1215cf124ec':
  docs: Moving library docs out of /tools/

Change-Id: Ia8e45a30547accfcdcfe00e5ad8e9454ac13929c
2016-04-28 20:52:41 +00:00
Justin Klaassen
1fe7ed557d Merge "Support view transformations when positioning floating CAB" into nyc-dev 2016-04-28 20:49:37 +00:00
Andrew Solovay
7877f69ddd docs: Moving library docs out of /tools/
The /tools/ top-level directory is going away when we move to devsite
(and the Android Studio docs get their own home) so I'm moving the
non-AS docs out of there. Also adding redirects (and fixing redirects
that pointed to the old locations).

For the time being, I'm also adding these libraries in to the
"API Guides" TOC, just so they're discoverable from somewhere; I'm
expecting this to change post-redesign.

See first comment for doc stage location.

bug: 28270787
Change-Id: I07488251384fbd22d2512a797793cf98654f54e7
2016-04-28 13:36:06 -07:00
Andrew Solovay
2ba6c81df3 Merge "Merge "docs: Updated support library overview" into mnc-mr-docs am: a872460fd3 am: 1e5295a37b am: 37b8afbbc2" into nyc-dev
am: 42eebfab6b

* commit '42eebfab6b71b47325581950c94b5a6baf2a2166':
  docs: Updated support library overview

Change-Id: I6a9ad28db856a0f824811de7dfaffe4fd3e24e67
2016-04-28 20:35:47 +00:00
Jorim Jaggi
a6436d1921 Merge "Fix issues with docked stack not un-minimizing" into nyc-dev
am: b72b265c85

* commit 'b72b265c85b2315c306de78d00365087c24375ce':
  Fix issues with docked stack not un-minimizing

Change-Id: I086bcba89e42a8b85004ad177297c8b2f34d70b1
2016-04-28 20:35:43 +00:00
Christopher Tate
eb87a4d969 Always log web link filter verification parameters
This is to support CTS's ability to check that the expected verifications
are indeed being performed by the currently active verifier.

Bug 27482754

Change-Id: Iccb9bd273c7893f04e45bfca0708dcfdde595a3e
2016-04-28 13:34:45 -07:00
Android Build Merger (Role)
42eebfab6b Merge "Merge "docs: Updated support library overview" into mnc-mr-docs am: a872460fd3 am: 1e5295a37b am: 37b8afbbc2" into nyc-dev 2016-04-28 20:33:33 +00:00
Jorim Jaggi
b72b265c85 Merge "Fix issues with docked stack not un-minimizing" into nyc-dev 2016-04-28 20:33:28 +00:00
Andrew Solovay
0bb679a279 Merge "docs: Updated support library overview" into mnc-mr-docs am: a872460fd3 am: 1e5295a37b
am: 37b8afbbc2

* commit '37b8afbbc238ea115a2642d9826fdc6f8f3100c9':
  docs: Updated support library overview

Change-Id: I5b27d52f40069abb9a03b5eef0a64fa237efc530
2016-04-28 20:33:03 +00:00
Jorim Jaggi
21e3cf35f4 Merge "Remove optimization to report config change" into nyc-dev
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: I1f31eefde69b88229585d7f09f5585cd471745ae
2016-04-28 20:32:42 +00:00
John Reck
2f69d6d4fd Support transform'd GraphicBuffers
Bug: 28428955
Change-Id: I23e2fc9b96a67c7cfda42d9d7319e478194a7fa7
2016-04-28 13:32:27 -07:00
Andrew Solovay
37b8afbbc2 Merge "docs: Updated support library overview" into mnc-mr-docs am: a872460fd3
am: 1e5295a37b

* commit '1e5295a37bdcb8f374de6e8f2c7199042af0b503':
  docs: Updated support library overview

Change-Id: I034f8948fa95241f6fefdf608294631adffecd93
2016-04-28 20:30:18 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Andrew Solovay
1e5295a37b Merge "docs: Updated support library overview" into mnc-mr-docs
am: a872460fd3

* commit 'a872460fd31c2cffde6ed467a43099590ad8aa7f':
  docs: Updated support library overview

Change-Id: I6d88be4d71d72d4223f9d0ec435d2e3abf8012b7
2016-04-28 20:27:35 +00:00
Felipe Leme
2b68497bff Merge "Whitelist Downloads Manager for Data Saver." into nyc-dev
am: 76d985f1df

* commit '76d985f1df75a67a16fda68dc08333a6acb0c636':
  Whitelist Downloads Manager for Data Saver.

Change-Id: I0729aae876696e001ed126b9144fb43694abd0c4
2016-04-28 20:27:30 +00:00
TreeHugger Robot
76d985f1df Merge "Whitelist Downloads Manager for Data Saver." into nyc-dev 2016-04-28 20:24:24 +00:00
Andrew Solovay
dd3b48de2f docs: Updated support library overview, CPd from mnc-mr-docs
Started this CL when mnc-mr-docs was the active branch, but now
the production builds come from mnc-docs.

Per feedback from the support library team, updated the support
library overview page to better explain what the libraries are
and what they're for. This is the beginning of a big overhaul of the
support library docs.

The "overview" section has been rewritten and expanded in this CL.
The "revisions" section hasn't been touched, except that the heading
was changed to "Support Library Revision History". (I'd like to
move "Revision History" to a separate page, but I'll do it in a
follow-on CL.)

See first comment for doc stage location.

bug: 27274455
Change-Id: I12ce21c948421e1bd0be5d3151845f900750e7b1
(cherry picked from commit 06ba3db938)
2016-04-28 20:23:41 +00:00