Commit Graph

246497 Commits

Author SHA1 Message Date
Youngsang Cho
e2cd56cc8a TIF: Handle possible memory leaks
Bug: 28656236
Change-Id: I162bb8ebc59be90ac1b1eb824c1db5aa9169c247
2016-05-09 15:30:43 -07:00
Joe Onorato
0ee1a7e838 Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: I27ccd973ff6a14387a11f19c30dcb5a3ae95b802
2016-05-09 22:17:08 +00:00
TreeHugger Robot
3b25fd081d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 2016-05-09 22:03:05 +00:00
Daniel Yu
3f2dd58872 docs: Updating Scoped Directory Access docs for N DP3
Adding info about new getStorageVolume(File) API.

Bug: 28449136

Change-Id: I33f91a65cb9c926a9f1569bf4bea637f622c1e71
2016-05-09 21:59:22 +00:00
Daniel Yu
9bef35b598 docs: Updating TV recording API docs for N DP3
Updating TV recording docs: change for TvInputManager.updateTvInputInfo(),
adding info on new android:canRecord attribute.

Bug: 28451239

Change-Id: I11bdb41245c5aedec566211b853293ed079c140c
2016-05-09 21:56:59 +00:00
Winson
7afa31af13 Merge "Fixing regression in call to showRecents()." into nyc-dev
am: e981777f0e

* commit 'e981777f0e92f7e35d283a41c98f4d99e561c679':
  Fixing regression in call to showRecents().

Change-Id: I8379d5f50fd30cf80e973109c8c3f9cb36bb0cc2
2016-05-09 21:49:56 +00:00
Paul Crowley
017d8647ab Merge "Two phases to set the password for disk encryption" into nyc-dev
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic77d5608961b34993848fc71809a27001d919abc
2016-05-09 21:49:54 +00:00
Winson Chung
e981777f0e Merge "Fixing regression in call to showRecents()." into nyc-dev 2016-05-09 21:36:57 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Chong Zhang
87704f6861 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev
am: a806e8ab12

* commit 'a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I936bcb7b7bd3610a7fb89c9ec51333be3d46506a
2016-05-09 21:27:57 +00:00
Steve Elliott
04141eac6b decouple HCE from FEATURE_NFC
Allows getting an instance of NfcAdapter through
NfcAdapter.getNfcAdapter on a device which has
FEATURE_NFC_HOST_CARD_EMULATION(_NFCF) but not FEATURE_NFC.

All non-HCE APIs will throw an UnsupportedOperationException if accessed
without FEATURE_NFC.

Bug: 24532713
Change-Id: I95c0309d8eea46f592b3c713541a3ed6e0f96aef
2016-05-09 21:19:03 +00:00
Chong Zhang
a806e8ab12 Merge "Fix a flicker when opening app again quickly while it's exiting" into nyc-dev 2016-05-09 21:16:49 +00:00
Amith Yamasani
d740e158cc Merge "Workaround for assist crash with multiwindow" into nyc-dev
am: 9fb0e97ecb

* commit '9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
  Workaround for assist crash with multiwindow

Change-Id: Ia026329d903ed525990614f9b046bbed3579a96b
2016-05-09 21:11:33 +00:00
TreeHugger Robot
9fb0e97ecb Merge "Workaround for assist crash with multiwindow" into nyc-dev 2016-05-09 21:04:00 +00:00
Selim Cinek
2c3f791150 Merge "Fixed a concurrent modification crash" into nyc-dev
am: f9f48ecd4c

* commit 'f9f48ecd4c59429550909c050a1317eca31b324f':
  Fixed a concurrent modification crash

Change-Id: I776698ffa8378e634554674e29dccea486b6cb13
2016-05-09 20:54:44 +00:00
Selim Cinek
e163ac23f4 Merge "Fixed a bug where notifications could become orphaned" into nyc-dev
am: ed47cf23e8

* commit 'ed47cf23e89c8af296d69464ac04996fbd7ee9a9':
  Fixed a bug where notifications could become orphaned

Change-Id: I39739574e87d758a5cffac5a51db075e6e782bcc
2016-05-09 20:43:44 +00:00
Sungsoo Lim
a6ac443071 Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev
am: c3fc7d4038

* commit 'c3fc7d4038a21918e42efd99f4759e963e1489a3':
  MediaBrowser: Make support lib v23.x available in N release

Change-Id: I2749788f07a78c7234825f0ad28d96c345731737
2016-05-09 20:43:41 +00:00
Selim Cinek
06416b9e57 Fixed a crash with min-priority notifications in a group
Those notifications could get into a group with higher priority
because they were autobundled or if the app said so.
This could lead to invisible views on the lockscreen and a crash
when this happened in an animated fashion.
The bug was triggering old code that wasn't needed anymore that
removed the viewstate.

Change-Id: Ic86c2f03d55f2e98e352cdbfbb3ca80d8e676765
Fixes: 28611831
2016-05-09 16:43:37 -04:00
Selim Cinek
f9f48ecd4c Merge "Fixed a concurrent modification crash" into nyc-dev 2016-05-09 20:42:53 +00:00
Winson
14db362511 Fixing regression in call to showRecents().
- Previously, the call was made to showRecents() which took a single 
  boolean to determine alt-tab state, and after the refactoring, it
  no longer made the same call.

Bug: 28663474
Change-Id: I75fb793e56c9a094a4372d7157dbd0dd7ecdbda7
2016-05-09 13:34:07 -07:00
TreeHugger Robot
ed47cf23e8 Merge "Fixed a bug where notifications could become orphaned" into nyc-dev 2016-05-09 20:33:14 +00:00
Jae Seo
c3fc7d4038 Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev 2016-05-09 20:32:46 +00:00
Joe Onorato
168638c594 Fix a couple bad links in the javadoc for android.os.health.
Bug: 28295754
Change-Id: I3b21e204bec626e4d1c6fb8f07580c2854e364eb
2016-05-09 13:32:32 -07:00
Joe Onorato
4240daca3a Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd
2016-05-09 20:16:56 +00:00
Philip P. Moltmann
80db52bf16 Merge "Init MidiService once system user gets unlocked." into nyc-dev
am: da08abed1e

* commit 'da08abed1e604238399bad02849c47c4d7447bf3':
  Init MidiService once system user gets unlocked.

Change-Id: I6aa45702b4de90125c87bb5be280178e44416485
2016-05-09 20:16:47 +00:00
TreeHugger Robot
ac29617c6e Merge changes I04301fbd,If6577602 into nyc-dev
* changes:
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
2016-05-09 20:05:13 +00:00
Greg Kaiser
71bd8bd19e Merge "ContextHub: Avoid reference leaks" into nyc-dev
am: 5ee41098b0

* commit '5ee41098b0d36cce4f6cb690cbaafdffb4177e8f':
  ContextHub: Avoid reference leaks

Change-Id: I7b8c1b5da46cdd1e6c1a294f338c6ace30b52ff6
2016-05-09 20:04:46 +00:00
Philip P. Moltmann
da08abed1e Merge "Init MidiService once system user gets unlocked." into nyc-dev 2016-05-09 20:04:39 +00:00
Greg Kaiser
5ee41098b0 Merge "ContextHub: Avoid reference leaks" into nyc-dev 2016-05-09 19:54:42 +00:00
Philip P. Moltmann
3ed7595216 Init MidiService once system user gets unlocked.
Bug: 28621670
Change-Id: I358aa8db6d1408c317f4ca66b4e5c5cbbcfe0826
2016-05-09 12:51:18 -07:00
Amith Yamasani
02c80c63d4 Workaround for assist crash with multiwindow
Temporarily disable multiwindow assist until
Bug: 28348867
is fixed correctly.

Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c
2016-05-09 12:46:23 -07:00
Bill Yi
51da315476 Import translations. DO NOT MERGE
Change-Id: I7921ec3d1287a09a13ef172c321f12d8b5c11862
Auto-generated-cl: translation import
2016-05-09 12:41:57 -07:00
Bill Yi
372975950a Import translations. DO NOT MERGE
Change-Id: I90029aa0a47b76221398447a65c4596952d9e043
Auto-generated-cl: translation import
2016-05-09 12:34:08 -07:00
Mark Renouf
cdb1ff373d Merge "Restore cursor in watch extract text view" into nyc-mr1-dev 2016-05-09 19:19:55 +00:00
Selim Cinek
619a5a2876 Merge "Fixed a bug where the statusbar could become empty" into nyc-dev
am: 319eecff96

* commit '319eecff96a318fc5a6909c8aee3a57206d0ca74':
  Fixed a bug where the statusbar could become empty

Change-Id: If64ffd2a77e5635b72a08bce806168d187c0b16a
2016-05-09 19:16:01 +00:00
Selim Cinek
210b14d872 Merge "Fixed a bug where Notifications could overlap" into nyc-dev
am: fa2dc63505

* commit 'fa2dc635052afa870629141dfcc7374fed5e9768':
  Fixed a bug where Notifications could overlap

Change-Id: I2123a1e204d3b9aaac300a682cb1514d62ba101b
2016-05-09 19:15:58 +00:00
Selim Cinek
319eecff96 Merge "Fixed a bug where the statusbar could become empty" into nyc-dev 2016-05-09 19:02:56 +00:00
Selim Cinek
fa2dc63505 Merge "Fixed a bug where Notifications could overlap" into nyc-dev 2016-05-09 19:02:31 +00:00
Yigit Boyar
b742b87a6b Remove detached headers
ListView was leaving header and footer views
in the detached state, which is a problem because
no view should be left in that state after a layout
calculation. This was also causing the view to never
received detached-from-window callback if
the ListView is detached while the header is not
visible.

This CL fixes an issue by traversing fixed views
and removing the ones that match the criteria.
To keep the behavior as similar as possible,
we still do not call startTmpDispatch on
fixed views unless we'll remove them.

Bug: 24490656
Change-Id: I8acfbd1a9d9b8b24c1c4b7692ef82cfe0f4d43a8
2016-05-09 11:45:57 -07:00
Sudheer Shanka
eaa6c6b540 Update docs for DELETE_PACKAGES permission.
Bug: 28302564
Change-Id: I283b8a5490a189fc90f64aec3278b87a430c2623
2016-05-09 11:44:00 -07:00
Janis Danisevskis
672b052115 Updates training/camera/photobasics.jd with FileProvider details
As of Android N, passing file:// URIs across package boundaries
throws a FileUriExposedException. This has caused frustration among
app developers trying to use our example as boilerplate code. This
patch replaces the "take picture" example with one that uses
content:// URIs and FileProvider instead.

Bug: 27636012
Change-Id: I9f0b4d9bbcd6b4bfa770dd1e4ad37f321e22195f
2016-05-09 18:34:22 +00:00
Wale Ogunwale
28024d64d3 Merge "Don\'t include IME in app screenshot while in multi-window mode" into nyc-dev
am: de5a7afc79

* commit 'de5a7afc7989ecef051635fdc9ae52a69870c026':
  Don't include IME in app screenshot while in multi-window mode

Change-Id: I38856256a6da41e16c2433079f0476ee44b8faac
2016-05-09 18:27:58 +00:00
Wale Ogunwale
cb4465d5cc Merge "Change ForcedResizableInfoActivity to handle config. changes" into nyc-dev
am: 8a111f5f20

* commit '8a111f5f20fcfe6707aa7bf02fde4f876e5505eb':
  Change ForcedResizableInfoActivity to handle config. changes

Change-Id: Ie5cf51c7eab84d1d4858bfabb0bf06bc94f4b633
2016-05-09 18:27:55 +00:00
Bill Yi
ea03ad09ca Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2d8ef7fcd5  -s ours

* commit '2d8ef7fcd52ad91ef23688d553a3d9396d589623':
  Import translations. DO NOT MERGE

Change-Id: Ie11b9ebe87631a9af6e5a6f2229dc27039baef78
2016-05-09 18:27:53 +00:00
Chong Zhang
e22006d936 Fix a flicker when opening app again quickly while it's exiting
If the app is waiting for an opening animation with a dummy placeholder,
we need to skip the surface placement (in addition to the animateLocked).

Also, when animating is changing from exiting to entering, the mAnimating
flag needs to be cleared until the new animation starts. This prevents the
surface placement to place it wrong before the new animaition starts.

bug: 28599295
bug: 27742244
Change-Id: I26f0ead80ee9993a6c766ae8686ab11d1729519c
2016-05-09 11:25:45 -07:00
TreeHugger Robot
de5a7afc79 Merge "Don't include IME in app screenshot while in multi-window mode" into nyc-dev 2016-05-09 18:22:29 +00:00
TreeHugger Robot
8a111f5f20 Merge "Change ForcedResizableInfoActivity to handle config. changes" into nyc-dev 2016-05-09 18:22:15 +00:00
Mark Renouf
d08e0f5cc2 Restore cursor in watch extract text view
Removes cursorVisible=false

Bug: 28669867
Change-Id: Id3cbaf70548aae361c52815f02f2988abb9ebdf4
2016-05-09 18:20:15 +00:00
Greg Kaiser
bece5990c7 ContextHub: Avoid reference leaks
We were leaking references in each call to onMessageReceipt(),
leading us to eventually run out of references and crash.  We
now delete our local references prior to leaving the function.
Also, since especially our message size can be quite large,
we put in logic to gracefully fail if the system is out of
memory.

In addition, we fix up reference leaks within
constructJContextHubInfo().  These were one-time leaks at
initialization, so not the root cause of our crash, but still
unnecessary leaks which are easily fixed.

Bug: 28655628
Change-Id: I3a3dc8e069c6c1810f3152872d8d8410e8ad0683
2016-05-09 11:19:20 -07:00
Wale Ogunwale
d0a166a37d Remove replaced window if we aren't animating its exit.
Allow removal of replaced window if it isn't running an exit animation
and wasn't set to run an exit animation.

Bug: 28411852
Change-Id: I916d7c9461691bc58367d012113fefe9c6485127
2016-05-09 11:18:18 -07:00