Commit Graph

246497 Commits

Author SHA1 Message Date
TreeHugger Robot
2d8ef7fcd5 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-09 18:18:06 +00:00
TreeHugger Robot
36663579b8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-09 18:17:50 +00:00
Tyler Gunn
b6029e3ba5 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev 2016-05-09 18:12:45 +00:00
Julia Reynolds
40711c7632 Merge "Autobundle all notifications; don\'t leave the most recent one free." into nyc-dev
am: e3e8eeaa7f

* commit 'e3e8eeaa7f604eb1e1a815a8cc438476aa4447b3':
  Autobundle all notifications; don't leave the most recent one free.

Change-Id: Icd9f2b865c3e46dccef3bfb0f23a3ebc3647c280
2016-05-09 18:09:39 +00:00
TreeHugger Robot
e3e8eeaa7f Merge "Autobundle all notifications; don't leave the most recent one free." into nyc-dev 2016-05-09 18:04:22 +00:00
smain@google.com
0254ce5fce update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) am: f2f8dff6eb am: d20d4c6cf3 am: 0d1bce5e5d
am: 0b0ad39b13

* commit '0b0ad39b13be289a4e37fcabb77946aa6818caec':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Ic4303d46b86986f6caaa92215ec910d871b116c3
2016-05-09 17:43:50 +00:00
smain@google.com
0b0ad39b13 update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) am: f2f8dff6eb am: d20d4c6cf3
am: 0d1bce5e5d

* commit '0d1bce5e5d3a0521466e8d12de792024325d8d91':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Iae2be6e4c6428e46ff1317d35eb3e12f97c6a813
2016-05-09 17:39:31 +00:00
smain@google.com
0d1bce5e5d update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018) am: f2f8dff6eb
am: d20d4c6cf3

* commit 'd20d4c6cf3bc5891d2a63024b1c5ba3abf5ed77d':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Ib717a1f84f3c32ba6ccb762d0b3ffba6a1bd37e0
2016-05-09 17:34:45 +00:00
Joe Onorato
181cada18a Flesh out the docs for the android.os.health package.
Bug: 28295754
Change-Id: I04301fbdbfb0708172adb4fd4b4a3658d5ea14eb
2016-05-09 10:32:31 -07:00
Joe Onorato
78bcdf91ed Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
It was setting the uid to -1, but BatteryStats should be tracking the actual uid.

Bug: 28637246
Change-Id: If6577602e3fe59a95b5cece4fc99e704ba43c03e
2016-05-09 10:32:30 -07:00
smain@google.com
d20d4c6cf3 update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)
am: f2f8dff6eb

* commit 'f2f8dff6eb50e673b32b8f6bb3c181267997aefd':
  update the older redirects based on studio restructure (https://critique.corp.google.com/#review/121836018)

Change-Id: Ib906d725e2de7012ebd305d64e12fc434c16a5ca
2016-05-09 17:30:33 +00:00
smain@google.com
f2f8dff6eb update the older redirects based on studio restructure
(https://critique.corp.google.com/#review/121836018)

Change-Id: I5c7cb01da2afe18885444c9bd6a3fc09526a42a8
2016-05-09 10:16:13 -07:00
Selim Cinek
c0b14b0e89 Fixed a concurrent modification crash
Because notifications could become isolated when
the group is suppressed it could lead to concurrent
modifications while looping.

Change-Id: Ifd4fe0cc24110455de0d3edf2da0be0773eb8c67
Fixes: 28652038
2016-05-09 13:13:58 -04:00
Selim Cinek
52941c5618 Fixed a bug where notifications could become orphaned
When a child got set not be a heads up after it was already
removed (When for example it was clicked on shortly after
it got posted) then it got orphaned leading to bad bugs
like the next notification not being visible. This
could happen often with WhatsApp who set the head up flags
on the summary instead of the children.

Change-Id: I52c8f5d9bc50080e4ece530255236d36f998372e
Fixes: 28565942
2016-05-09 13:13:56 -04:00
Jaewan Kim
4a97a7ee29 Merge "Fix recents row blinking when PIP is focused" into nyc-dev
am: ccb85eb411

* commit 'ccb85eb411f5df1c50e504d4acfc973e8cbb6835':
  Fix recents row blinking when PIP is focused

Change-Id: I0ad552940e97fff6a00e9d3c6eeef3451e15c05f
2016-05-09 17:12:07 +00:00
Jaewan Kim
ccb85eb411 Merge "Fix recents row blinking when PIP is focused" into nyc-dev 2016-05-09 17:05:54 +00:00
Youhan Wang
d4ddc7bcc1 Merge "Add getAidForApptype()." into nyc-mr1-dev 2016-05-09 17:04:57 +00:00
Calin Juravle
8412cf4daa Revert "Enable profile merging for post-OTA package verification"
This reverts commit 5da9dad2dd.

Bug: 28612421

Change-Id: Idbbb24241362a70b697ae2d648ea47996f5239c6
2016-05-09 17:56:18 +01:00
Jae Seo
14b768f05f Merge "MediaRouter: Add more logs for debugging" into nyc-dev
am: 99aa441581

* commit '99aa4415815fd906b93f5d5220762b94133cefef':
  MediaRouter: Add more logs for debugging

Change-Id: I85e675c3e8c3a31e4c988413a549c13660c0ecd0
2016-05-09 16:51:35 +00:00
Jae Seo
99aa441581 Merge "MediaRouter: Add more logs for debugging" into nyc-dev 2016-05-09 16:39:51 +00:00
Richard Uhler
ce2b1925ed Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev
am: 8e96faae78

* commit '8e96faae783fe1850d66bf3fb01fbb4579662959':
  Hold a ClassLoader reference in NativeAllocationRegistry.

Change-Id: I36b5b0572f99f77c909c4af7fdc3143fc05397dc
2016-05-09 16:02:10 +00:00
Richard Uhler
4500ff5105 Merge "Remove inconsistent \'cmd package compile\' documentation." into nyc-dev
am: 12f2984dbf

* commit '12f2984dbf10e89124afd7bf8242f564e5a176aa':
  Remove inconsistent 'cmd package compile' documentation.

Change-Id: I00eb70c24edb5338294d0d43abcd3bcdf2121ef0
2016-05-09 15:53:16 +00:00
Richard Uhler
8e96faae78 Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev 2016-05-09 15:50:30 +00:00
Richard Uhler
12f2984dbf Merge "Remove inconsistent 'cmd package compile' documentation." into nyc-dev 2016-05-09 15:48:47 +00:00
smain@google.com
8df38f92bf update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 am: ab5bf95626 am: 1a8f9e3ca0 am: 5e42875297
am: beb01ff874

* commit 'beb01ff8746bb3b16359f420e78bbd96026c61fb':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I20da7408b72736757f4f17fe0b7791b75452cc9c
2016-05-09 15:36:43 +00:00
smain@google.com
beb01ff874 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 am: ab5bf95626 am: 1a8f9e3ca0
am: 5e42875297

* commit '5e428752971f2e3dfc3fda73633fc346f50f2763':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I76513a274909a296589c1354dfc0551764390e72
2016-05-09 15:32:36 +00:00
smain@google.com
5e42875297 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749 am: ab5bf95626
am: 1a8f9e3ca0

* commit '1a8f9e3ca00fb4436710e34b1f7fb2259adc066f':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: Id0d7cf68025c8f6b082ebfdec6c9727e963d6b9a
2016-05-09 15:28:14 +00:00
smain@google.com
1a8f9e3ca0 update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749
am: ab5bf95626

* commit 'ab5bf95626850e97124b912ca2699fb164574186':
  update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I7524aa066efa4241c6a14d881b23dee0da8e2632
2016-05-09 15:23:51 +00:00
smain@google.com
ab5bf95626 update redirects for /studio files for the restructure
from this CL: https://critique.corp.google.com/#review/121726749

Change-Id: I2c06eb12267f11d69a1dbd6f1c96a7bf1ef4a61c
2016-05-09 15:12:40 +00:00
Victor Chang
8560a7c2a1 Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
- TrustedCredential is responsible to show ConfirmCredential
- Show the MonitoringCerInfoActivity in personal side instead to avoid showing work challenge
- put user id into extra

Bug: 28619980
Change-Id: Iedbc0b721ef56675f3c9eb6f1d12daf1222ad080
2016-05-09 16:05:32 +01:00
Alan Viverette
2b5efd4578 Merge "Always mutate child when added to drawable container" into nyc-dev
am: d1f686f5dc

* commit 'd1f686f5dcf33606cf1e83cf2f7b8e41f5bd9148':
  Always mutate child when added to drawable container

Change-Id: Ief6bbd8ab12d2e92dfc3a742c2acbed221c35a51
2016-05-09 14:14:35 +00:00
Alan Viverette
784aa1498f Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
am: d8c38b892b

* commit 'd8c38b892b86cc9cb94633b6f9d74126e2d53c60':
  Cancel animation and jump to current state if not animating picker

Change-Id: I20684e1e974e1d5f8f6987ca9eac17d3da470763
2016-05-09 14:14:33 +00:00
Alan Viverette
d1f686f5dc Merge "Always mutate child when added to drawable container" into nyc-dev 2016-05-09 14:06:53 +00:00
Alan Viverette
d8c38b892b Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev 2016-05-09 14:06:29 +00:00
Michael Wright
feaf99fa1b Stop emitting javadoc for @removed attributes.
We need the attributes to remain public because people might still be
linking against them, but we don't want them showing up in the
documentation any more. Them showing up in the documentation also had
the side effect that it would accidentally mark the parent class of
attributes as @removed, which was not intended.

Bug: 28663748

Change-Id: I2f6eb09455fddf1086e6b24bc3bea5292e8e32b7
2016-05-09 14:51:41 +01:00
Jason Monk
fe3659e575 Merge "QQS: Fix ripple clipping" into nyc-dev
am: d4bdf9ca7c

* commit 'd4bdf9ca7c99fce6e4c40d2f572a3556abbdc7ce':
  QQS: Fix ripple clipping

Change-Id: I1f86af0dfbff85b5a15ae6342f5990c0d729b03d
2016-05-09 13:27:09 +00:00
Jason Monk
d4bdf9ca7c Merge "QQS: Fix ripple clipping" into nyc-dev 2016-05-09 13:20:20 +00:00
Bill Yi
1c490a0e8b Import translations. DO NOT MERGE
Change-Id: I513904878092ec474a6580c933beb79adf0f50ff
Auto-generated-cl: translation import
2016-05-09 06:17:33 -07:00
Bill Yi
1d51db6ba8 Import translations. DO NOT MERGE
Change-Id: Ia3e265610e5f562a0acfe849e2c7473f2bd44594
Auto-generated-cl: translation import
2016-05-09 06:14:28 -07:00
bohu
b3dac031cf Merge "Ensure Netd Service is alive" into nyc-dev
am: d521a6d146

* commit 'd521a6d1467a41ba20744f63dd70a40be0f35be0':
  Ensure Netd Service is alive

Change-Id: I733966cdfbfeae1d5603bcbd175af5f7e3038a78
2016-05-09 01:37:42 +00:00
Bo Hu
d521a6d146 Merge "Ensure Netd Service is alive" into nyc-dev 2016-05-09 01:32:17 +00:00
bohu
07cc3bb040 Ensure Netd Service is alive
At least on android TV emulator system image, the Netd
service could be null when the setDnsConfigurationForNetwork
is invoked.

bug: 28553503
Change-Id: If059495c8573ede287c4e9d8f343318d519fca7f
2016-05-08 07:56:59 -07:00
Carlos Valdivia
06329e5fb2 [Security] Prevent malicious notifications from AMS.
There was a hole in the getAuthToken logic that allowed notifications
resulting from getAuthToken requests using notifyOnAuthFailure=true to
launch arbitrary activites on the device. This is because the
getAuthToken session overrode onResult (unlike addAccount, updateCreds,
or confirmCreds).

Bug: 13787929
Change-Id: Ife1d48835f48416c2f0690f1413a076b69215190
2016-05-07 21:46:15 -07:00
Wale Ogunwale
a5434dd987 Don't include IME in app screenshot while in multi-window mode
We don't screenshot the IME in multi-window mode because the frame
of the IME might not overlap with that of the app. E.g. IME target
app at the top in split-screen mode and the IME at the bottom
overlapping with the bottom app.

Bug: 28446505
Change-Id: Iae4f7eafa582779a4cf2aba3d83c4d9f76a4ccca
2016-05-07 16:40:45 -07:00
Wale Ogunwale
3840c88938 Change ForcedResizableInfoActivity to handle config. changes
This created extra churn in the system during resize due to
the activity relaunching.

Bug: 28614747
Change-Id: I148b6fca3dad7e10c90085a04bccb99587397912
2016-05-07 14:13:52 -07:00
Jae Seo
18687b7a27 MediaRouter: Add more logs for debugging
Bug: 28517884
Change-Id: I325b407983e79a78701acfbfd8f109657f006846
2016-05-07 14:12:55 -07:00
Wale Ogunwale
7cd4b01af3 Fixed bug with pop-up window placement at the bottom in split-screen
WindowState.mInsetFrame is used to represent a temp. offset of a task
due to something like docked stack resizing or IME currently on screen.
In the case of pop-up windows (or any child window that wants to layout
in the parent frame) we were incorrectly setting the containing frame
because we were checking to see if the mInsetFrame wasn't empty. This
check isn't needed for child windows that want to layout in parent frame
because the parent frame will already have the mInsetFrame applied to
its frame which will automatically trickle down to the display and content
frame it forwards to its child windows to use.

Bug: 28389714
Change-Id: If89d40845a5a14aa60abcdedef2385b1fe7bfee3
2016-05-07 12:41:22 -07:00
Sungsoo Lim
2584cda885 ExifInterface: Set mPosition in AssetStream with proper values
Bug: 28649955
Change-Id: I25ab833f54e4ee853d3b89af513b4ecd7dc02df9
2016-05-07 18:45:07 +09:00
Sungsoo Lim
6b7bda0bc3 MediaBrowser: Make support lib v23.x available in N release
A workaround change for supporting support lib 23.x in N release.
This change should be reverted in some point before O release.

Bug: 28572934
Change-Id: I7e6afc0293688e425736bc93da0ea10233c07e9a
2016-05-07 17:45:40 +09:00
Jorim Jaggi
7f5e29b255 Merge "Fix minimized state messup" into nyc-dev
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527
2016-05-07 00:07:58 +00:00