Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,881 Commits 3 Branches 0 Tags
104f8053370f9e01ac2e8e23bc31d128e5fcc00b
Commit Graph

253881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert McMeen
67089cf406 Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e0c68 
am: a2adb69e92

Change-Id: I8c5031245e9d732e7fa8203bbef7c02e4ec1112b
 2016-09-28 22:26:08 +00:00
Bert McMeen
d1f9d7e47d Docs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2 
am: f1947456d6

Change-Id: I53ef864ed337d10b39b5e593a64c7c6863a85cbf
 2016-09-28 22:25:07 +00:00
Bert McMeen
78f8405a9b Merge "Docs: Complications additions and changes" into nyc-dev 
am: 754dfad475

Change-Id: Iabcad86121f0d40862588ff4f46fabb3dc1a08f2
 2016-09-28 22:19:23 +00:00
Bert McMeen
780d8b2c2b Docs: Complications additions and changes 
am: 5c7636218d

Change-Id: If99792cb54a76edc7f307ab0a4f583ba810627f0
 2016-09-28 22:19:20 +00:00
Bert McMeen
21aa30c3ca Merge "Docs: FDP3 pages for standalone apps" into nyc-dev 
am: 5f97d8e3cf

Change-Id: I26d77a521f02a1191632f8df5d380bec820d8721
 2016-09-28 22:18:00 +00:00
Bert McMeen
e15b0a2de2 Docs: FDP3 pages for standalone apps 
am: 22109c72fb

Change-Id: I526af72a24b19ecb4c12259279cf9928500df6f1
 2016-09-28 22:17:58 +00:00
Bert McMeen
a2adb69e92 Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev 
am: 90150e0c68

Change-Id: Ic4e30589cc3d95c29afa19b47144ff784108780a
 2016-09-28 22:16:05 +00:00
Bert McMeen
f1947456d6 Docs: Preview 3 - Update to bridging of notifications 
am: 1c3bccceb2

Change-Id: I1a1e46653fab53bf3883518e007334a68f6c5cf0
 2016-09-28 22:16:03 +00:00
Bert McMeen
754dfad475 Merge "Docs: Complications additions and changes" into nyc-dev 2016-09-28 22:11:45 +00:00
Sreevani Sreejith
0c9e841f2a Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94 
am: 51f1145a2b

Change-Id: Ib6b1a29f81ad3ee89e0d5cd5d1f604d6b40f45cc
 2016-09-28 22:11:13 +00:00
sreevanis
05da9ee3f3 docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b 
am: 5480deaad8

Change-Id: Ibebadfa911fbc1a1624f78a8818de309eb3bb635
 2016-09-28 22:10:14 +00:00
Sreevani Sreejith
37c9eb2da4 Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc 
am: e27e22b9e4

Change-Id: I2c71a1c42c090f8bec3276e239c7f6ef86a15fd6
 2016-09-28 22:09:22 +00:00
sreevanis
b9cfe89f01 docs: Documentation for WearableRecyclerView. am: 2d1a177045 
am: 4dbcb9c66d

Change-Id: Ie25e14e118b2a0734ccdc064d7522b035dc7afcc
 2016-09-28 22:08:27 +00:00
Sreevani Sreejith
43d954ea70 Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842 
am: 0d6d4a67f7

Change-Id: I76fb62083e2005c05b417534001bf6f370fd741f
 2016-09-28 22:07:40 +00:00
Bert McMeen
5f97d8e3cf Merge "Docs: FDP3 pages for standalone apps" into nyc-dev 2016-09-28 22:07:05 +00:00
sreevanis
5b5a5470c8 docs:Added Wear partner logos. am: bfc1ba951e 
am: 52458ec6fc

Change-Id: I74ebb658c6af1136c394ab0e4e7b396150b616bc
 2016-09-28 22:06:43 +00:00
Bert McMeen
90150e0c68 Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev 2016-09-28 22:06:03 +00:00
Sreevani Sreejith
51f1145a2b Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev 
am: a0611bfd94

Change-Id: Id43f71ba103e7b7eb4654427541f8989f0abc1fc
 2016-09-28 22:01:32 +00:00
sreevanis
5480deaad8 docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. 
am: b00d08796b

Change-Id: I7a891bebec11cc89182ef0a42be293a855b0945c
 2016-09-28 22:01:30 +00:00
Sreevani Sreejith
e27e22b9e4 Merge "docs: Documentation for WearableRecyclerView." into nyc-dev 
am: de101dfbdc

Change-Id: I33d0e40c2ad1bf2c9b867ccf94e1aaecbd671543
 2016-09-28 22:00:12 +00:00
sreevanis
4dbcb9c66d docs: Documentation for WearableRecyclerView. 
am: 2d1a177045

Change-Id: I0f3306ada5d2fbae552cbef1860f20bc70b5c307
 2016-09-28 22:00:08 +00:00
Sreevani Sreejith
0d6d4a67f7 Merge "docs:Added Wear partner logos." into nyc-dev 
am: 9d5d25f842

Change-Id: If538241f49f9aa74143e2a24dc644acc8ac119a9
 2016-09-28 21:58:50 +00:00
sreevanis
52458ec6fc docs:Added Wear partner logos. 
am: bfc1ba951e

Change-Id: I3afb3d061da5966171dbe455c608a07cd0692172
 2016-09-28 21:58:48 +00:00
Sreevani Sreejith
a0611bfd94 Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev 2016-09-28 21:51:40 +00:00
Sreevani Sreejith
de101dfbdc Merge "docs: Documentation for WearableRecyclerView." into nyc-dev 2016-09-28 21:50:40 +00:00
Sreevani Sreejith
9d5d25f842 Merge "docs:Added Wear partner logos." into nyc-dev 2016-09-28 21:50:13 +00:00
Adrian Roos
7813dd7918 DirectReply: Prevent closing the IME window on reinflation 
Fixes a bug where the IME window would close if
the notification gets reinflated while direct reply
is open.

Change-Id: I37b8b29abe6b36c24e9a8bbf86f346523f1a4203
Fixes: 31181080
Test: manually; receive hangouts message, open direct reply, receive
      second message. Observe if IME closes.
 2016-09-28 14:38:43 -07:00
Eino-Ville Talvala
4e3bb26f64 Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev 2016-09-28 21:20:21 +00:00
Tony Mantler
5eb91a437c AsyncTask terminating with exception calls onCancelled 
Test: cts/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
b/30304893

Change-Id: Icb50cda8026ddd70d457b5e62eb29c81313ee47d
 2016-09-28 21:16:56 +00:00
Vladislav Kuzkokov
cd339f211a Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev 2016-09-28 21:15:09 +00:00
Vladislav Kuzkokov
a7d26d9171 Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev 2016-09-28 21:14:48 +00:00
sreevanis
b00d08796b docs: Added documentation for Inline action on notification stream 
and steps for adding images to a notification.

Bug:31012795
Change-Id: Ic7cbf1c2b8b5c2c7b18dadc95dd10c8b0d4add5b
 2016-09-28 13:35:41 -07:00
Kevin Hufnagle
d36471009a Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev am: de85f4d045 
am: 9c2b6aceb8

Change-Id: I949c7403b034d9a331e1b579f20ff3e45ebaf2d9
 2016-09-28 20:29:31 +00:00
Kevin Hufnagle
511f442c41 docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. am: b960272cc4 
am: ca45197735

Change-Id: I01039b1fb34e2f5041ef80ad372f25dba73bf552
 2016-09-28 20:28:39 +00:00
Kevin Hufnagle
69231463ab Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev am: cc717cdb01 
am: f3f0edd59f

Change-Id: I94c74357fead76956c55f6479fecf49db52b6f21
 2016-09-28 20:22:35 +00:00
Kevin Hufnagle
7d8018e0d5 docs: Fixed constants in manifest sample related to battery level. am: d00481bef2 
am: 8d12a2a1c9

Change-Id: Ic14678197693a1b8997a999b626784845c25127c
 2016-09-28 20:21:45 +00:00
Kevin Hufnagle
9c2b6aceb8 Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev 
am: de85f4d045

Change-Id: Ib58c5bc8c6e74ae184ab448d0aad7176d11d0932
 2016-09-28 20:17:11 +00:00
Kevin Hufnagle
ca45197735 docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. 
am: b960272cc4

Change-Id: I9fbc8c06dfd2c8aed47a0d84f73b48c50be205c0
 2016-09-28 20:17:08 +00:00
Kevin Hufnagle
f3f0edd59f Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev 
am: cc717cdb01

Change-Id: I9a90c173581e6058cd3d883f17f2b2d8aa72c4b8
 2016-09-28 20:15:48 +00:00
Kevin Hufnagle
8d12a2a1c9 docs: Fixed constants in manifest sample related to battery level. 
am: d00481bef2

Change-Id: I66559bea4c416170893587a737913b42197079c9
 2016-09-28 20:15:45 +00:00
Kevin Hufnagle
de85f4d045 Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev 2016-09-28 20:09:59 +00:00
Kevin Hufnagle
cc717cdb01 Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev 2016-09-28 20:09:31 +00:00
TreeHugger Robot
7c9aaa6ef6 Merge "Force APKs to be streamed" into nyc-mr1-dev 2016-09-28 20:06:20 +00:00
Bert McMeen
5c7636218d Docs: Complications additions and changes 
Bug: 28864917
Change-Id: I9551d30ee5fb4db9a77373b6445e145a5f4a3b11
 2016-09-28 12:43:12 -07:00
Vladislav Kuzkokov
1975021d88 Fix backup for users hit by erroneous backup disabling 
BUG=31754835

Change-Id: I89dd08b7958dd8fe20d70bc50f2c89996ae46cc5
 2016-09-28 21:31:16 +02:00
TreeHugger Robot
e7809891f7 Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev 2016-09-28 19:07:20 +00:00
Vladislav Kuzkokov
bbaadc0166 Fix logic in disabling BackupTransport in DO mode. 
We were disabling backup in consumer mode as well.

BUG=31754835
TEST=android.content.pm.cts.shortcuthost.ShortcutManagerBackupTest

Change-Id: I42e5cfa512fda1b471eb62c7eb8bc346383da2fa
 2016-09-28 20:24:42 +02:00
Tianjie Xu
2a03586998 Log the error when uncrypt timeouts 
Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.

Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b
(cherry picked from commit 036d08638e)
 2016-09-28 11:19:03 -07:00
sreevanis
bfc1ba951e docs:Added Wear partner logos. 
Bug:31364865
Change-Id: Iab45bd1d058a6fd407d546b69c0368d7a7c69015
 2016-09-28 11:16:56 -07:00
Eino-Ville Talvala
ec727411d2 DngCreator: Do not cache timezone in static initializer 
The static initializer for a pre-loaded framework class is run
no later than at zygote startup, which happens at device boot.

Which means that if the timezone later changes, DngCreator will use
an incorrect cached timezone until the next reboot.  This is especially
evident in freshly wiped devices, where initial setup will typically
change the timezone.

Instead, read the timezone each time DngCreator is created, which is
also when we query the current time for constructing the timestamps.

Test: android.hardware.camera2.cts.DngCreatorTest#testSingleImageThumbnail
Bug: 31743060
Change-Id: I83a4eac762650e5f904f3b8fa779c094cef30562
 2016-09-28 11:10:00 -07:00