Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
37b3e5f71b am 09c85903: Update current.txt with generics to field types. automerge: 80c9fbe automerge: bf43899 
* commit '09c85903161e5e5d1606552f0a37fe64f981c8cf':
  Update current.txt with generics to field types.
 2014-10-28 07:17:16 +00:00
Winson Chung
170b31a45e am e6a2068c: Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 automerge: 0baa55a 
* commit 'e6a2068c2780a040fb0a72820a132ad0578deb1e':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 07:17:13 +00:00
Jeff Sharkey
4b67bd101a am a7a3479a: Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 automerge: 05cff40 
* commit 'a7a3479a85a68175f4d35f8ee977ca6b3b5f618b':
  Check upgrade certs before permissions.
 2014-10-28 07:17:07 +00:00
John Reck
a8f1bce008 am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc 
* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
  Cleanup debug options
 2014-10-28 07:17:03 +00:00
Alan Viverette
3ed8a3131b am 7a21011a: Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 automerge: 5a01fcd 
* commit '7a21011a2de6dac1ccccea94998b2677f22e4b8e':
  Fix min/max date range in DatePicker calendar mode
 2014-10-28 07:16:59 +00:00
Wale Ogunwale
72dbb9b374 am 7e003ba7: Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e automerge: e1c6d89 
* commit '7e003ba7511b5d4a5722b08c02760ad79bb1f42c':
  Added documentation for various window frame types.
 2014-10-28 07:16:55 +00:00
Alan Viverette
b21e2e392b am 7e79fd3e: Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b automerge: b64176b 
* commit '7e79fd3ee2e9b1f27f20fec7eaa4353bbdf1bab2':
  Clean up some javadocs in Window.setFeature...()
 2014-10-28 07:16:51 +00:00
Jeff Sharkey
4e61168681 am 720147e2: Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39 automerge: 19022f6 
* commit '720147e2490d895608c7b61a7d8a5e262c371178':
  Follow API removal.
 2014-10-28 07:16:46 +00:00
Mike Lockwood
e889c8e393 am bfdc6b50: Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 automerge: 9f08a9f 
* commit 'bfdc6b50f49d6b0f352d0a8c0d63bbde0c6038e8':
  Improve toString() methods for audio classes to help with debugging
 2014-10-28 07:16:42 +00:00
Jeff Sharkey
eb0baea9a0 am a38592ae: Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373 automerge: 817722b 
* commit 'a38592ae5d0cd6ed6d2a8c105d4d26475d4b7a07':
  Follow ArraySet refactoring.
 2014-10-28 07:16:38 +00:00
Jeff Sharkey
6007da7b73 am a148a0dc: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9 
* commit 'a148a0dc667ac35599a35a46f2232f0128269d78':
  Drop DEV network stats to save RAM.
 2014-10-28 07:16:34 +00:00
Dake Gu
286918f718 am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev automerge: 63964d9 
* commit '54aad9533646d3e4ebbf474858112d61424f9b6d':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-28 07:16:30 +00:00
Jeff Sharkey
23801ccafb am 1c665948: am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev automerge: 301b563 
* commit '1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-28 07:16:25 +00:00
Eric Laurent
972c42e34a am 4ec1d430: am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev automerge: af93061 
* commit '4ec1d430db6c9b564d9b78e3654507594e9dce8c':
  audioservice: fix default stream volume
 2014-10-28 07:16:21 +00:00
Jeff Hao
7caa514807 am 2b8a1b38: am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev automerge: ad1a613 
* commit '2b8a1b38ecca250a57358675c3a08d7640925fb5':
  Get UsageStats if no PackageUsage is available for boot dexopt filtering.
 2014-10-28 07:16:18 +00:00
Wink Saville
831296e84f am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12 
* commit 'ae85478d3dbed145825293c307bde4213ff175f3':
  Change subId to int from long
 2014-10-28 07:16:13 +00:00
Evan Charlton
b2dda69031 am 4d4b2cfd: am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev automerge: 8e25057 
* commit '4d4b2cfd4c611800787b71d0896c6d8781875732':
  Move telecom permission to the public API
 2014-10-28 07:16:08 +00:00
Geoff Mendal
4ab11bb72e am 47545d47: (-s ours) am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours automerge: 39545fc -s ours 
* commit '47545d4777b686ee39e10d7040ec562fcae9fba2':
  Import translations. DO NOT MERGE
 2014-10-28 07:16:04 +00:00
Geoff Mendal
248d73b885 am a3983b27: (-s ours) am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: e5661ee -s ours 
* commit 'a3983b27e6a4fa410a172fda0ef23bf27b8deabe':
  Import translations. DO NOT MERGE
 2014-10-28 07:16:00 +00:00
Adrian Roos
91f4344eee am b3726de1: am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev automerge: f9b36d5 
* commit 'b3726de168116903293d86d7876183be7e1549b4':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
 2014-10-28 07:15:56 +00:00
Jorim Jaggi
019390f6f5 am f53bc26f: am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev automerge: 97f1a97 
* commit 'f53bc26f4ef2bf4e2ea122f9a7dd2471ca6f83e0':
  Fix padding between battery and system icons
 2014-10-28 07:15:51 +00:00
Jorim Jaggi
f61a71b92b am 7157ce9e: am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev automerge: 876820e 
* commit '7157ce9e94d7198e9604f8a9c1324290f1ef1bae':
  Fix system icon widths
 2014-10-28 07:15:46 +00:00
Jorim Jaggi
d866ef6cc1 am 05e7c26b: am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev automerge: 286f361 
* commit '05e7c26b0d0aa0799615d2dd69beadb2af1a6637':
  Add padding when both data icon and wifi icon is visible
 2014-10-28 07:15:42 +00:00
George Mount
24bf96f0a2 am 06e74b30: am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev automerge: 7b042be 
* commit '06e74b30aebe38c93d55e1ffc05493c3c9941f52':
  Fix transition being canceled improperly.
 2014-10-28 07:15:39 +00:00
George Mount
5d0e36e692 am 8b92704f: am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev automerge: 3437192 
* commit '8b92704f021fa4f33fcac5a50442b2f5259d198b':
  Add resizeClip attribute to ChangeBounds.
 2014-10-28 07:15:34 +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