Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
640780236c Merge "Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master am: f8243e1e99" into nyc-dev-plus-aosp 2016-09-28 22:03:50 +00:00
Dianne Hackborn
518629ba34 DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API am: a327e3b3a7 -s ours 
am: b76d44f3ce

Change-Id: Ibcee9dc973283afa9a78f6357018deb9034a006f
 2016-09-28 22:03:45 +00:00
Android Build Merger (Role)
7b6f4889e4 Merge "Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94" into nyc-dev-plus-aosp 2016-09-28 22:03:03 +00:00
Android Build Merger (Role)
017aff52d4 Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b" into nyc-dev-plus-aosp 2016-09-28 22:02:43 +00:00
Sreevani Sreejith
21156c7d6d 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: Ie6f566aa8bbd0f8a79af768d528d0f317a13fd10
 2016-09-28 22:01:51 +00:00
sreevanis
ff3c74c915 docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. 
am: b00d08796b

Change-Id: I5bf5ec8a0272d653ec71d57d233dc5155453d25d
 2016-09-28 22:01:48 +00:00
Kenny Root
851f42c54f Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master 
am: f8243e1e99

Change-Id: I67553b5f49940723937cb9b3b84f4a4a9a5af9aa
 2016-09-28 22:01:46 +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
Android Build Merger (Role)
75bd45688f Merge "Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc" into nyc-dev-plus-aosp 2016-09-28 22:01:30 +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
Android Build Merger (Role)
865d57fe29 Merge "docs: Documentation for WearableRecyclerView. am: 2d1a177045" into nyc-dev-plus-aosp 2016-09-28 22:01:08 +00:00
Andreas Gampe
13018f3730 OtaDexopt: Fix after-ota space measure 
Actually measure the available space.

Bug: 31458900
Change-Id: I16ecee6c275229bc21e908b88b24152484025bc8
(cherry picked from commit 8d1d2ab5b9)
 2016-09-28 15:01:06 -07:00
Sreevani Sreejith
493934caad Merge "docs: Documentation for WearableRecyclerView." into nyc-dev 
am: de101dfbdc

Change-Id: Ic4e856936adce9de9cc512eb63ccf715da213d3c
 2016-09-28 22:00:25 +00:00
sreevanis
7d5ccdaae9 docs: Documentation for WearableRecyclerView. 
am: 2d1a177045

Change-Id: I0f8c8af72bb85c01b465d6415d33d0a37bedda07
 2016-09-28 22:00:20 +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
Android Build Merger (Role)
7c8f1de31e Merge "Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842" into nyc-dev-plus-aosp 2016-09-28 22:00:03 +00:00
Android Build Merger (Role)
fb78be5e9f Merge "docs:Added Wear partner logos. am: bfc1ba951e" into nyc-dev-plus-aosp 2016-09-28 21:59:38 +00:00
Sreevani Sreejith
d677d6506c Merge "docs:Added Wear partner logos." into nyc-dev 
am: 9d5d25f842

Change-Id: Id1995a3badda8e32ed0b43ca1f692c98bfb6ffbd
 2016-09-28 21:58:51 +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
4f21a2c76f docs:Added Wear partner logos. 
am: bfc1ba951e

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

Change-Id: I3afb3d061da5966171dbe455c608a07cd0692172
 2016-09-28 21:58:48 +00:00
Kenny Root
9584c0e55f DO NOT MERGE Track generics in API definition. 
am: ae0c402a45  -s ours

Change-Id: Ia1d55feccea94f34787498f37b8d20d33137bc16
 2016-09-28 21:57:44 +00:00
Dianne Hackborn
b76d44f3ce DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API 
am: a327e3b3a7  -s ours

Change-Id: Ifb5a69244f35a3cbca59cf3667b5eb0698eaab50
 2016-09-28 21:56:34 +00:00
Andreas Gampe
112e01480f OtaDexoptService: Add tron logging 
Log key properties of A/B OTA dexopting.

Bug: 31458900
Change-Id: Iba1e5a40ff8b4998d4d876800ee59940f01afb6e
(cherry picked from commit 77cc8172d3)
 2016-09-28 14:54:14 -07: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
TreeHugger Robot
f8243e1e99 Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master 
* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
 2016-09-28 21:47:54 +00:00
Eino-Ville Talvala
deba87734b Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev am: 4e3bb26f64 
am: 64aba83098

Change-Id: I102949e4f93a70cfbfe846643526fb11b3808fc9
 2016-09-28 21:39:18 +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
f6ea31d8f1 DngCreator: Do not cache timezone in static initializer am: ec727411d2 
am: fa141e303e

Change-Id: I3174eb2adccc587761ab64e226eda6bd59e2295a
 2016-09-28 21:36:29 +00:00
Vladislav Kuzkokov
935c306796 Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev am: cd339f211a 
am: e36d393d74

Change-Id: I087cfcc70726bee2ebcf6f92302530f69ce58779
 2016-09-28 21:35:30 +00:00
Vladislav Kuzkokov
da82fa0a3f Fix logic in disabling BackupTransport in DO mode. am: bbaadc0166 
am: cfaef4287d

Change-Id: I171072819fb93c671a30c7576c1150673a38c617
 2016-09-28 21:34:35 +00:00
Vladislav Kuzkokov
dd01ce7bda Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev am: a7d26d9171 
am: 266a5747da

Change-Id: Iea1dc92b2e3b55b61f7a23f21dea1eed1ccaf4b3
 2016-09-28 21:33:41 +00:00
Vladislav Kuzkokov
852c39433c Fix backup for users hit by erroneous backup disabling am: 1975021d88 
am: 56d7022d48

Change-Id: I200b204c07d77007a27b8462cf3e5b831b873b1d
 2016-09-28 21:32:46 +00:00
Eino-Ville Talvala
64aba83098 Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev 
am: 4e3bb26f64

Change-Id: Ice6815ac6922e53fa3ec3e7826cb9468dd4ce49d
 2016-09-28 21:27:23 +00:00
Eino-Ville Talvala
fa141e303e DngCreator: Do not cache timezone in static initializer 
am: ec727411d2

Change-Id: I86d207b7bfd156f5296aa3f5ba5acecd2d762d4e
 2016-09-28 21:27:21 +00:00
Vladislav Kuzkokov
e36d393d74 Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev 
am: cd339f211a

Change-Id: I31dc7073d276b710d66cc977ee09cbfea2893e55
 2016-09-28 21:26:02 +00:00
Vladislav Kuzkokov
cfaef4287d Fix logic in disabling BackupTransport in DO mode. 
am: bbaadc0166

Change-Id: I89c0a7fb44bc50efedf2e8dc5eabaa4711b2687b
 2016-09-28 21:26:00 +00:00
Vladislav Kuzkokov
266a5747da Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev 
am: a7d26d9171

Change-Id: Id44778f1808ac380f86633e932f7a6583502ce3d
 2016-09-28 21:24:46 +00:00
Vladislav Kuzkokov
56d7022d48 Fix backup for users hit by erroneous backup disabling 
am: 1975021d88

Change-Id: I4421e9642c2e89bf17535ef3212617d268c1c9d2
 2016-09-28 21:24:44 +00: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
Andreas Gampe
1920d7b434 OtaDexopt: Downgrade apps when low on space 
When running low on space, attempt to "downgrade" apps to lower
states in the optimization flow to free up space before starting
the OTA.

Bug: 31347757
Change-Id: I3a44b106b83d86d7290f4c557267b319f28de12a
(cherry picked from commit dab38e0004)
 2016-09-28 14:11:08 -07:00
Kenny Root
e2154926a9 Merge "DO NOT MERGE Track generics in API definition." into nyc-dev-plus-aosp 
am: 791c1e29c2

Change-Id: Ia90bab84167f08ee4a1622c88f2d1fe5396e995c
 2016-09-28 21:09:42 +00:00
Kenny Root
58873896ad DO NOT MERGE Track generics in API definition. 
am: 88de13a8d4

Change-Id: I230199a163f1b5544cc1696fe147f6a6c44bd2b3
 2016-09-28 21:06:22 +00:00
Andreas Gampe
33c592da0c Installer: Support delete_odex command 
Add support for deleting odex files.

Bug: 31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
(cherry picked from commit e5fedb9576)
 2016-09-28 14:00:20 -07:00