Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,059 Commits 3 Branches 0 Tags
472eb8115ac351b498b24f347338820039fddf64
Commit Graph

52833 Commits

Author SHA1 Message Date
Adam Lesinski
472eb8115a am f17138f0: Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 
* commit 'f17138f068af9f89d760b4c0f33c0a32a267d849':
  Fix calculation of power drain from BT and WiFi
 2015-06-09 19:55:15 +00:00
Adam Lesinski
f17138f068 Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 2015-06-09 19:52:11 +00:00
Adam Lesinski
8576cf941d Fix calculation of power drain from BT and WiFi 
Unit issue (mV vs V).

Change-Id: I08843312339ccf35a3b55b1c2385c36fdbf61ead
 2015-06-09 12:48:25 -07:00
Yohei Yukawa
8370f40fe1 am eae09d1a: Merge "Update JavaDoc of EditorInfo#packageName." into mnc-dev 
* commit 'eae09d1ad759f7f28bc7f958cce41f8bd0f22ecd':
  Update JavaDoc of EditorInfo#packageName.
 2015-06-09 19:36:07 +00:00
Yohei Yukawa
eae09d1ad7 Merge "Update JavaDoc of EditorInfo#packageName." into mnc-dev 2015-06-09 19:23:02 +00:00
Selim Cinek
c98afce379 am 78528b22: Fixed a RTL layouting bug with LinearLayout 
* commit '78528b22c29f570469fe3c75328042f83a5a24c3':
  Fixed a RTL layouting bug with LinearLayout
 2015-06-09 18:37:52 +00:00
Selim Cinek
78528b22c2 Fixed a RTL layouting bug with LinearLayout 
When the RTL properties of a horizontal LinearLayout
changed, nobody enforced the view to be layouted anew,
even though its layout is dependent on the layout
direction. This could lead to stale layouts being
temporarily layouted the wrong way.

Bug: 20495301
Change-Id: I979c8d86ee711626b2901b65ebdf007c1eb1c0fa
 2015-06-09 18:33:19 +00:00
Andreas Gampe
7138620c29 am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 
* commit '2c936af815167b3f6bbb21d5dccea78b0bd348af':
  Frameworks/base: Add is64Bit method to Process
 2015-06-09 18:33:18 +00:00
Andreas Gampe
2c936af815 Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 2015-06-09 18:20:00 +00:00
Doris Liu
46cc604686 am a46ccc16: Merge "Infer value type for ObjectAnimator, too" into mnc-dev 
* commit 'a46ccc164dc0a39964e85f8135963cda78ac9677':
  Infer value type for ObjectAnimator, too
 2015-06-09 17:47:17 +00:00
Doris Liu
a46ccc164d Merge "Infer value type for ObjectAnimator, too" into mnc-dev 2015-06-09 17:42:00 +00:00
Clara Bayarri
ef5d99ca65 am 0f925d0d: Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 
* commit '0f925d0def01d586108c6ef0683efd8d9bbe1737':
  Fallback to old Window.Callback#onWindowStartingActionMode
 2015-06-09 17:27:28 +00:00
Clara Bayarri
0f925d0def Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 2015-06-09 17:18:50 +00:00
Richard Uhler
e28ce32fdc am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 
* commit '659716d7a03553006e67b01008c2e9e03a20ed31':
  Add Debug.MemoryInfo.getMemoryStats API.
 2015-06-09 16:59:21 +00:00
Julia Reynolds
63183794fb am 058652c2: Merge "Remove the ability to set a preferred setup activity." into mnc-dev 
* commit '058652c23d9551e780e56d26d9e6c46963bfafee':
  Remove the ability to set a preferred setup activity.
 2015-06-09 16:59:15 +00:00
Richard Uhler
659716d7a0 Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 2015-06-09 16:40:57 +00:00
Julia Reynolds
cedd53adc3 Remove the ability to set a preferred setup activity. 
Bug: 21557327
Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
 2015-06-09 12:34:27 -04:00
Andreas Gampe
ee0cdce2a8 Frameworks/base: Add is64Bit method to Process 
Add a public method to Process to query whether the current runtime
is running in 64-bit mode.

Bug: 21069469
Change-Id: Ifaf4251f05bbe5eba135fa977190e475632856bd
 2015-06-09 09:22:55 -07:00
Erik Kline
a51e4d87e0 am 1162744f: Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev 
* commit '1162744fedbd35f3999221cc9abc4caa3204a4b2':
  Make public Network#bindSocket(FileDescriptor).
 2015-06-09 07:56:58 +00:00
Erik Kline
d895999858 Make public Network#bindSocket(FileDescriptor). 
Code that uses android.system.Os to create sockets as FileDescriptors
should be able to bind them to networks.  Note that FileDescriptors
could already be marked as "protected from VPNs" via
NetworkUtils#protectFromVpn(), but heretofore were not easily bound
to any particular network.

Bug: 21449922
Change-Id: I4bb86db5d95d5a55bb2d7e245848d11eaa351e65
 2015-06-09 16:19:24 +09:00
Jim Miller
d6832af714 am 800ebfc1: Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 
* commit '800ebfc166a96e4125029cd994011ada750e56de':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 01:54:35 +00:00
Jim Miller
800ebfc166 Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 2015-06-09 01:46:22 +00:00
Jorim Jaggi
7fe7abbb15 am b835dd76: Close assist when launching intents from notification shade 
* commit 'b835dd7641c60cd5d2b372331ffc19f7165244bd':
  Close assist when launching intents from notification shade
 2015-06-09 00:33:58 +00:00
Guang Zhu
6af2cdfba8 am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev 
* commit '53b3bb072bcebd6b7d89a6b06139f458e9240ae9':
  clean up Process instance after we are done with the sub process
 2015-06-09 00:33:53 +00:00
Jorim Jaggi
b835dd7641 Close assist when launching intents from notification shade 
Bug: 21035363
Change-Id: I51a6dbe5f0d93aaf81a38d1f1afacaaeaf7732e2
 2015-06-09 00:31:12 +00:00
Guang Zhu
53b3bb072b Merge "clean up Process instance after we are done with the sub process" into mnc-dev 2015-06-09 00:30:39 +00:00
Clara Bayarri
9f8f6e4e1c Fallback to old Window.Callback#onWindowStartingActionMode 
Some custom implementations of Window.Callback might not have the new
typed method, fallback to typeless if it is implemented and the type
was Primary.

Change-Id: Ie98f9a57354363f1b9f8e48f889298f3ee4b59e2
 2015-06-09 01:26:08 +01:00
Yohei Yukawa
915e2c7731 Update JavaDoc of EditorInfo#packageName. 
This CL does nothing but updates JavaDoc of EditorInfo#packageName
about the changes made in M.

Bug: 18931038
Change-Id: I8c94f6470d77e22daabb7caa0ea57e85e51b3ec5
 2015-06-08 17:05:44 -07:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec 
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
 2015-06-08 16:36:29 -07:00
Adam Lesinski
5993aab937 am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit '4cf59747f8e23b1d23ee7450541e34826dccbd4f':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:25:42 +00:00
Adam Lesinski
4cf59747f8 Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 2015-06-08 23:14:17 +00:00
Jonathan Basseri
9da4d7d5fc am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:36:07 +00:00
Adam Lesinski
df6235cd76 Bump the BatteryStats parcel VERSION 
A previous change forgot to bump the version, leading to
corrupt data.

Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
 2015-06-08 15:04:16 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
Doris Liu
2787cebfdc Infer value type for ObjectAnimator, too 
Previously, changes have been made to infer value types for
PropertyValuesHolder when no value type is defined. This CL applies
the same inferring logic to ObjectAnimator too.

Bug: 21645431
Change-Id: Ifdf163a7d32da990dc2281080f87f94c0df0e9ce
 2015-06-08 14:42:13 -07:00
Etan Cohen
c9fb4e5c6b am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '7631697793a8b82bb2a1cd3adced1b140d266427':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:39:44 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
Wale Ogunwale
4174eb27ed am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit 'd8b9b642feab52523ec6db7b170b08f1bc74b004':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:21:27 +00:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Andrew Flynn
0c13fa8466 am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '21a4f17c942165684bc590de594984912459396d':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:07:10 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks. 
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
 2015-06-08 13:02:44 -07:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
Dianne Hackborn
530deec05e am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '54d729b73f54798d3112129894cb6fe8ef75920b':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 19:56:48 +00:00
Mike Lockwood
74beaed319 am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit '383ce580b1c9e706d1b06a23d81986f3b4ed83fb':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 19:51:32 +00:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
Andrew Flynn
410bceba5b am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit '2429e6a8d96a4eba83e22c35595fa05e0f5e51f2':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 17:38:55 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Tim Kilbourn
97e7873ee1 am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '72285e5600fad17c42730d6f84164d8425d4d43c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 17:02:25 +00:00