drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,760 Commits 1 Branch 0 Tags
Commit Graph

165760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
98a8258dd8 am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 
* commit 'bd6f4a818ef36764eb69ef7308eb6a9bf3740138':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 14:44:28 +00:00
Adrian Roos
bd6f4a818e Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 2014-10-28 14:37:39 +00:00
Craig Mautner
2381825db4 am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 
* commit '74fe6ce72dcbc7af501022e7617528c30a0983bb':
  Do not go through a layout if visibility is GONE
 2014-10-28 14:00:54 +00:00
Craig Mautner
74fe6ce72d Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 2014-10-28 13:56:09 +00:00
Jason Monk
952d5d8d8a Add hotspot icon to status bar 
Bug: 17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
 2014-10-28 09:31:42 -04:00
Christoph Studer
c1d93cf4dc Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 6857203 
automerge: 3fc8118

* commit '3fc811803db5f534399697dab1994e19af2a95f3':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 12:57:50 +00:00
Christoph Studer
3fc811803d Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 
automerge: 6857203

* commit '685720309a582acc513454d674f82368479c5297':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 12:45:50 +00:00
Christoph Studer
685720309a Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 2014-10-28 12:41:33 +00:00
Ari Sachter-Zeltzer
0b695be179 am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 
automerge: 35bedd1

* commit '35bedd19d4b8a1b902be38bc4765de29376df9e4':
  fixed jank on activity close exit with better alpha interpolation
 2014-10-28 09:48:40 +00:00
Ari Sachter-Zeltzer
35bedd19d4 am 20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 
* commit '20edd0532738e9df72da0a9b6d39d541b9cb1ca9':
  fixed jank on activity close exit with better alpha interpolation
 2014-10-28 09:01:39 +00:00
Ari Sachter-Zeltzer
20edd05327 Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 2014-10-28 08:58:23 +00:00
Erik Kline
e9810e8d53 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 
automerge: 8fc600d

* commit '8fc600d1a8fc4f9cedceee185d129a19b06001c5':
  (re)define the definition of "provisioned"
 2014-10-28 08:54:03 +00:00
Lorenzo Colitti
9d6f408ab5 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
automerge: 35261c4

* commit '35261c4351ea42b2bbd057e852f50158de8eda9c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:50:41 +00:00
Erik Kline
8fc600d1a8 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 
automerge: dd91fb4

* commit 'dd91fb44743f15ee308a4cfedeca6338b6912fdc':
  (re)define the definition of "provisioned"
 2014-10-28 07:57:29 +00:00
Erik Kline
dd91fb4474 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Lorenzo Colitti
35261c4351 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
* commit '111cc9f511dc65006fc2972c9ecbf295619e09b9':
  Change removeStackedLink to take an interface name.
 2014-10-28 07:13:09 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lajos Molnar
2577b3c0d8 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7 
automerge: e4c7a65

* commit 'e4c7a65140b5523325fd6ca86c196136fe183ee8':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 06:23:59 +00:00
Lorenzo Colitti
f3cab63ef2 Change removeStackedLink to take an interface name. 
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
 2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6 (re)define the definition of "provisioned" 
Specifically:

    [1] provide a hasIPv4(), and
    [2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

    [3] redefine isProvisioned() to return the logical OR
        of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
 2014-10-28 14:47:42 +09:00
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +00:00
Lajos Molnar
e4c7a65140 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 
automerge: aab38b7

* commit 'aab38b7ea0b1774d158789772d0f6b1b99c1d3c9':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 04:11:38 +00:00
Griff Hazen
47f644a227 DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec -s ours automerge: d1cbf9a -s ours 
automerge: eb19a9b  -s ours

* commit 'eb19a9bb8a729d0f13720b88e28fc17ece13af17':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 03:42:46 +00:00
Jason Monk
48d7a89c2c Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740 
automerge: 8ae1a5e

* commit '8ae1a5e10efdb58b83b510337dddd47759bdc650':
  Add missing passive discovery flag
 2014-10-28 03:41:57 +00:00
Ying Wang
49310befce Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours automerge: bc66de0 
automerge: dbfdebf

* commit 'dbfdebfff850239a3bd478846bf3fba85df8f67a':
  Update current.txt with generics to field types.
 2014-10-28 03:41:09 +00:00
Yuncheol Heo
9a3e75783e Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b 
automerge: 522e0af

* commit '522e0afa0fc400ceeee034c1b593b73a2787f659':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 03:40:16 +00:00
Alan Viverette
52f67ffc5d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2 
automerge: 8e448af

* commit '8e448aff2df5f41dc4b329134306fd700f497ca6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 03:39:26 +00:00
Ying Wang
09c8590316 Update current.txt with generics to field types. automerge: 80c9fbe 
automerge: bf43899

* commit 'bf438996e04d833d882581b25cc24f10d8a2c568':
  Update current.txt with generics to field types.
 2014-10-28 03:38:27 +00:00
Lajos Molnar
aab38b7ea0 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 2014-10-28 03:28:18 +00:00
Joe Fernandez
40bf63e0f0 Merge "docs: Update timing of Android Wear app review" into lmp-docs 2014-10-28 03:25:40 +00:00
Joe Fernandez
a3c9be01e8 docs: Update timing of Android Wear app review 
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
 2014-10-27 20:22:52 -07:00
Griff Hazen
eb19a9bb8a DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec -s ours 
automerge: d1cbf9a  -s ours

* commit 'd1cbf9a8703a0fa2eefd9ad0f565f99120b61c3b':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 03:08:11 +00:00
Jason Monk
8ae1a5e10e Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e 
automerge: e585740

* commit 'e58574026b265b4773f1e9bc896ba53530c7a580':
  Add missing passive discovery flag
 2014-10-28 03:07:22 +00:00
Ying Wang
dbfdebfff8 Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours 
automerge: bc66de0

* commit 'bc66de0df9421ea0ffc36a1a6f6d8fd8bd7dfcda':
  Update current.txt with generics to field types.
 2014-10-28 03:05:59 +00:00
David Friedman
3c00bc01f9 Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 2014-10-28 02:51:32 +00:00
David Friedman
576a4b7371 Updates Notifications screenshot for Android 5.0. 
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
 2014-10-27 19:29:45 -07:00
Griff Hazen
d1cbf9a870 DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
automerge: 732e4ec  -s ours

* commit '732e4ecbee3168c19e49469934f0e1cd3268e001':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 02:23:34 +00:00
Jason Monk
e58574026b Add missing passive discovery flag automerge: 4444c5b 
automerge: 07faf0e

* commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
  Add missing passive discovery flag
 2014-10-28 02:21:20 +00:00
Ying Wang
bc66de0df9 Update current.txt with generics to field types. automerge: 79775d4 
automerge: 475d739  -s ours

* commit '475d7393bf0cbb80dd1911df30a6ba0292da09c3':
  Update current.txt with generics to field types.
 2014-10-28 02:20:25 +00:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
 2014-10-27 19:19:22 -07:00
Yuncheol Heo
522e0afa0f Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 
automerge: 571cc6b

* commit '571cc6b19511b07d77418b1f0288eb467d367a9a':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 01:57:50 +00:00
Alan Viverette
8e448aff2d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 
automerge: e5d27a2

* commit 'e5d27a22a6908026d346e86389cf414b5badeab6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 01:56:59 +00:00
Ying Wang
bf438996e0 Update current.txt with generics to field types. 
automerge: 80c9fbe

* commit '80c9fbe36fe8b1e298a70c465e85ee677fc12e12':
  Update current.txt with generics to field types.
 2014-10-28 01:55:59 +00:00
Yuncheol Heo
571cc6b195 Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 2014-10-28 01:04:07 +00:00
Alan Viverette
e5d27a22a6 Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 2014-10-28 00:57:11 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag 
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
 2014-10-28 00:52:56 +00:00
Alan Viverette
d4e7790fee Play CLICK sound effect when compound buttons are clicked 
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.

BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
 2014-10-27 17:50:51 -07:00
Ying Wang
80c9fbe36f Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 17:42:04 -07:00
Winson Chung
e6a2068c27 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 
automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 00:37:10 +00:00
Jeff Sharkey
a7a3479a85 Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 
automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
  Check upgrade certs before permissions.
 2014-10-28 00:36:08 +00:00