Commit Graph

250340 Commits

Author SHA1 Message Date
Ruben Brunk
8d84bc861f Merge "Fix setVrThread's exception handling." into nyc-mr1-dev 2016-08-10 00:59:27 +00:00
Erik Kline
c14748b366 Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev 2016-08-10 00:47:57 +00:00
Dianne Hackborn
75cdd5f68f Merge "Fix issue #30766518: Document what targeting N does" into nyc-mr1-dev 2016-08-10 00:45:55 +00:00
Ruben Brunk
83ea55a9c6 Fix setVrThread's exception handling.
Bug: 30746129
Change-Id: I49ee29f12b52c9f9f5f061508c5cc8c89fd1cd11
2016-08-09 17:30:13 -07:00
TreeHugger Robot
e11059694a Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev 2016-08-09 23:50:41 +00:00
Selim Cinek
00a6c2979b Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev 2016-08-09 23:41:36 +00:00
TreeHugger Robot
a63469076e Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev 2016-08-09 23:22:42 +00:00
TreeHugger Robot
002dd29764 Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev 2016-08-09 21:48:10 +00:00
Makoto Onuki
377b7970ad Rescan apps after restore and re-publish manifest shortcuts
Originally when I wrote backup & restore for ShortcutManager,
there was no manifest shortcuts, so there was no need to
handle preintalled apps specially.

However, now we have manifest shortcuts, which are published
when the user is unlocked, by the time restore happens preinstalled
apps may already have manifest shortcuts, which will be overwritten
by the restored shortcuts.

So we need to re-publish manifest shortcuts after restore.

Bug 30746028

Change-Id: I6afbae7790c9ed38483637f33c381ecb6f854677
2016-08-09 14:43:55 -07:00
TreeHugger Robot
529319d81d Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev 2016-08-09 21:29:06 +00:00
Hemal Patel
4e79fcdc0a Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am: 5ca44906c6
am: b6962dee09

Change-Id: I5145db9e35199969ada9c38a6c5c972725af178b
2016-08-09 21:10:42 +00:00
Hemal Patel
f8c0a138fb Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
am: dabee01e9b

Change-Id: I6a17d73c3dab8980c57e9f6c9617bb465c48f1a5
2016-08-09 21:10:40 +00:00
Hemal Patel
ee3c5b3cd5 Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am: a70c722c77
am: 3c49a4b761

Change-Id: Ib00803734137a0a4c3a704e45c45c66e246e586b
2016-08-09 21:10:37 +00:00
Hemal Patel
ed51cf2c85 Docs: Changed custom_toast to toast_layout am: 3b7309d753
am: ca17f5b8e3

Change-Id: Ief6d2b58e26b4510b00ecb07a5efba180276cd37
2016-08-09 21:10:35 +00:00
Hemal Patel
b6962dee09 Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am: 5ca44906c6

Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
2016-08-09 21:03:19 +00:00
Hemal Patel
dabee01e9b Docs: Fixed the link that loads Fragments guide
am: a8e1c75bf6

Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
2016-08-09 21:03:13 +00:00
Hemal Patel
3c49a4b761 Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am: a70c722c77

Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
2016-08-09 21:03:06 +00:00
Hemal Patel
ca17f5b8e3 Docs: Changed custom_toast to toast_layout
am: 3b7309d753

Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
2016-08-09 21:03:00 +00:00
Hemal Patel
5ca44906c6 Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs 2016-08-09 20:55:35 +00:00
Hemal Patel
a70c722c77 Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs 2016-08-09 20:53:12 +00:00
Erik Wolsheimer
b2b3b64417 Add missing null check to AppErrors#handleAppCrashLocked
BUG: 30692618
Change-Id: Ibe3589e1248520067714d5a20963a17935789066
(cherry picked from commit dc74142c74)
2016-08-09 20:25:28 +00:00
Dianne Hackborn
b34cbedb4e Fix issue #30766518: Document what targeting N does
Also small documentation cleanup in a few other places.

Change-Id: I16581c751aa0ffa146faba3b140a8fa2170f4520
2016-08-09 13:21:24 -07:00
Shawn Willden
58635e74ed Merge "Fix @link tags in keystore doc" into nyc-docs am: 3188f77658
am: 7218af3f9a

Change-Id: I302b1dce1cff57b6f1cd5da3d6619984c80fde92
2016-08-09 19:38:05 +00:00
Shawn Willden
e5d71c4cfa Fix @link tags in keystore doc am: 3f0526ea09
am: 9e8b4ad9c9

Change-Id: Iadb16bd13d4bb525805dd0266aea046c4c472309
2016-08-09 19:38:00 +00:00
Shawn Willden
7218af3f9a Merge "Fix @link tags in keystore doc" into nyc-docs
am: 3188f77658

Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
2016-08-09 19:01:04 +00:00
Shawn Willden
9e8b4ad9c9 Fix @link tags in keystore doc
am: 3f0526ea09

Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
2016-08-09 19:01:00 +00:00
TreeHugger Robot
6715c6abbd Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev 2016-08-09 18:59:34 +00:00
TreeHugger Robot
3188f77658 Merge "Fix @link tags in keystore doc" into nyc-docs 2016-08-09 18:35:10 +00:00
TreeHugger Robot
6529ab20fb Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev 2016-08-09 18:25:03 +00:00
Geoffrey Pitsch
3025e6be7f Merge "BootAnimation system property to play sound." into nyc-mr1-dev 2016-08-09 17:08:55 +00:00
Julia Reynolds
6434eb2e04 Clean up zen rules and permissions immediately on uninstall.
Change-Id: I8d03f4a4347b7d7bffbe267961c75ed5863a4113
Fixes: 30740759
2016-08-09 12:54:07 -04:00
Wale Ogunwale
847167fe3d Limit number of recents entries for an app to maxRecents allowed.
Regression in the API caused by the fixes for b/28293748 and b/25460953
which prevented the task entries from been trimmed if the task don't
have the same intent filter (additional documents launched will normally
have different intent action/filter than the base activity) or it allows
multiple task entries.
We now trim when we go over the maxRecents allowed in both cases.

Bug: 30645949
Bug: 28293748
Bug: 25460953
Change-Id: I74c8ecc38f72a5d03c213dea8d3e62261d42f8f6
2016-08-09 09:29:20 -07:00
Jorim Jaggi
9a7d0a5f84 Fix navigation bar in seascape in BackdropFrameRenderer
Change-Id: I922aaf835011b236f4b4d34f249304e335c3318b
Fixes: 30670517
2016-08-09 13:47:20 +02:00
Erik Kline
fa37b2f613 Handle setting and deprecating local DNS IPv6 addresses
[ IPv6TetheringCoordinator ]

  - Send CMD_IPV6_TETHER_UPDATE to all TetherInterfaceStateMachines.

This results in some spurious noop messages, but currently
the coordinator does not maintain state about which downstream interaces
are serving IPv6 and which are not.  Until it does maintain such state
it does not know to notify only the affected interfaces about a loss of
IPv6 upstream

[ IPv6TetheringInterfaceServices ]

    - De-dup incoming IPv6-only LinkProperties to avoid spurious updates
      to the RA daemon.
    - Keep track of new prefixes/dns and newly deprecated prefixes/dns
      on each update.
        - Set and remove local_network routes based on new and newly
          deprecated prefixes.
        - Set and remove local DNS server IP addresses based on new
          and newly deprecated DNS servers. Update dnsmasq via netd
          accordingly.
    - Pass newly deprecated and new information to the RA daemon.

[ RouterAdvertisementDaemon ]

    - Receive newly deprecated prefixes/DNS and update local tracking
      data structures accordingly.
    - Properly send urgent final deprecation RAs, and then cease all
      transmissions.

Bug: 30298058
Change-Id: Idc821603fa93bff1a821d1180d4135bc70e4a08d
2016-08-09 19:19:43 +09:00
Jim Miller
837fa7e56d Bind fingerprint when we start authentication
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-08 20:16:22 -07:00
TreeHugger Robot
0b26adbb8b Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev 2016-08-09 00:34:09 +00:00
Selim Cinek
4ae263c87c Put the affordance launch animation back on the renderthread
Change-Id: I10f6b7062d9c6ca89e139ef6b67af30cb39adcb2
Fixes: 30484027
2016-08-08 17:27:24 -07:00
TreeHugger Robot
d5b0b9bb1f Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev 2016-08-09 00:24:05 +00:00
Android Build Merger (Role)
0402936230 Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev 2016-08-08 23:49:30 +00:00
Android Build Merger (Role)
fc9f55873a Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev 2016-08-08 23:49:19 +00:00
Kevin Hufnagle
70f8ca8dff Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: I48f91ef763f6591e16751d9ae8fd9d86be277111
2016-08-08 23:48:52 +00:00
Kevin Hufnagle
7a13b16dcf docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Ie85273ed977c06e9b82a77d66a7333e9eca86e10
2016-08-08 23:48:50 +00:00
Chris Craik
a9bef43149 Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev 2016-08-08 23:44:08 +00:00
Hemal Patel
a8e1c75bf6 Docs: Fixed the link that loads Fragments guide
In the class description, fixed the reference link that points to the
Fragments guide.

Bug: 29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
2016-08-08 16:43:22 -07:00
Kevin Hufnagle
87c2ed97b8 Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev 2016-08-08 23:35:27 +00:00
Christopher Tate
dd7110db2b Handle empty/unspecified crop properly in wallpaper restore
Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.

Bug 30521402
Bug 30274136

Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01
2016-08-08 16:15:52 -07:00
TreeHugger Robot
369c6ebf02 Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev 2016-08-08 23:01:43 +00:00
Mark Lu
66847abba6 docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibc12639849de4edcbcfdaa1c0f543d6f2eb868f8
2016-08-08 23:00:09 +00:00
TreeHugger Robot
6cb5152e9f Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev 2016-08-08 22:55:06 +00:00
Mark Lu
325399bfb9 Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Ief38c0b6b1b61e8fcc060224c298fb3a4711cc94
2016-08-08 22:49:11 +00:00