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

157405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
4a915ab505 am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4':
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 16:44:31 +00:00
Adrian Roos
288f65e381 Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev 
* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon
 2014-10-28 15:23:14 +00:00
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
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
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
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
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
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
Lajos Molnar
aab38b7ea0 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 2014-10-28 03:28:18 +00: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
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
0baa55a743 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-27 23:53:52 +00:00
Jeff Sharkey
05cff4047d Merge "Check upgrade certs before permissions." into lmp-mr1-dev 
automerge: e795533

* commit 'e79553355b10815be2cd44f7b84ae39c91a12bb1':
  Check upgrade certs before permissions.
 2014-10-27 23:53:00 +00:00
John Reck
49a01fc7dc Merge "Cleanup debug options" into lmp-mr1-dev 
automerge: b0aeaad

* commit 'b0aeaad442e6cd4920d75a63d65a91267cf9199a':
  Cleanup debug options
 2014-10-27 23:42:35 +00:00
Alan Viverette
5a01fcd194 Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 
automerge: 3847552

* commit '384755230c52f0951820ba496f300959dcc84ead':
  Fix min/max date range in DatePicker calendar mode
 2014-10-27 23:41:44 +00:00
Wale Ogunwale
e1c6d89817 Merge "Added documentation for various window frame types." into lmp-mr1-dev 
automerge: 674f55e

* commit '674f55e515d0895475d136f7793f6ce9929d859c':
  Added documentation for various window frame types.
 2014-10-27 23:40:54 +00:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Alan Viverette
b64176bd87 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 
automerge: 253626b

* commit '253626b822b3b20fdb9727705593b4b5b55b8553':
  Clean up some javadocs in Window.setFeature...()
 2014-10-27 23:39:09 +00:00
Jeff Sharkey
e79553355b Merge "Check upgrade certs before permissions." into lmp-mr1-dev 2014-10-27 23:35:58 +00:00
John Reck
b0aeaad442 Merge "Cleanup debug options" into lmp-mr1-dev 2014-10-27 23:27:30 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag 
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
 2014-10-27 19:25:50 -04:00
Alan Viverette
384755230c Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 2014-10-27 23:16:26 +00:00
Wale Ogunwale
674f55e515 Merge "Added documentation for various window frame types." into lmp-mr1-dev 2014-10-27 23:05:39 +00:00
Alan Viverette
253626b822 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 2014-10-27 22:39:12 +00:00
Jeff Sharkey
c28bd3532b Check upgrade certs before permissions. 
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app.  So do a quick signature
sanity check before checking permissions.

Bug: 18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
 2014-10-27 15:38:27 -07:00
Ying Wang
475d7393bf Update current.txt with generics to field types. 
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
 2014-10-27 22:35:59 +00:00
Jeff Sharkey
19022f6991 Merge "Follow API removal." into lmp-mr1-dev 
automerge: d634d39

* commit 'd634d39c605553e669a16fd8fd406aa4695f54af':
  Follow API removal.
 2014-10-27 22:19:21 +00:00
Mike Lockwood
9f08a9f08a Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 
automerge: ac7d8c5

* commit 'ac7d8c5cc85dc5929b5d1c9d7836aca58a4e9ea5':
  Improve toString() methods for audio classes to help with debugging
 2014-10-27 22:18:05 +00:00