Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,575 Commits 3 Branches 0 Tags
36c28ee54385ad8dba0bb760639bca96b76fc748
Commit Graph

49212 Commits

Author SHA1 Message Date
Andreas Gampe
36c28ee543 am e95f4bf1: am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 
* commit 'e95f4bf113e8274f591b8fcc4b6f9d609ce5b978':
  Frameworks/base: Add is64Bit method to Process
 2015-06-09 18:58:49 +00:00
Andreas Gampe
e95f4bf113 am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 
* commit '3f2fbf7e1fa8338cc7d700c951a750f353bdff84':
  Frameworks/base: Add is64Bit method to Process
 2015-06-09 18:43:32 +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
646ae4bd33 am f8ea71cb: am eab5b438: am a46ccc16: Merge "Infer value type for ObjectAnimator, too" into mnc-dev 
* commit 'f8ea71cb8c473cf0ae2a9b7572b8cb70f5b25491':
  Infer value type for ObjectAnimator, too
 2015-06-09 18:11:27 +00:00
Doris Liu
f8ea71cb8c am eab5b438: am a46ccc16: Merge "Infer value type for ObjectAnimator, too" into mnc-dev 
* commit 'eab5b438df7b80abe1f08b252ddc3d91c9eaa22e':
  Infer value type for ObjectAnimator, too
 2015-06-09 17:58:57 +00:00
Doris Liu
a46ccc164d Merge "Infer value type for ObjectAnimator, too" into mnc-dev 2015-06-09 17:42:00 +00:00
Richard Uhler
fb12ff0daa am c5de6931: am d58abdd1: am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 
* commit 'c5de6931c162c0ec5153f16c1653cee5527bf383':
  Add Debug.MemoryInfo.getMemoryStats API.
 2015-06-09 17:27:29 +00:00
Julia Reynolds
87f0f73b02 am 6be25283: am 6ca311ca: am 058652c2: Merge "Remove the ability to set a preferred setup activity." into mnc-dev 
* commit '6be25283c8c5d7b2be78839a59626bb590a1e7bc':
  Remove the ability to set a preferred setup activity.
 2015-06-09 17:27:22 +00:00
Richard Uhler
c5de6931c1 am d58abdd1: am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 
* commit 'd58abdd12f79bebad894ea54973ef57061e7dc15':
  Add Debug.MemoryInfo.getMemoryStats API.
 2015-06-09 17:12:32 +00:00
Julia Reynolds
6be25283c8 am 6ca311ca: am 058652c2: Merge "Remove the ability to set a preferred setup activity." into mnc-dev 
* commit '6ca311ca99bc1290d714c6918e57db6daef7a941':
  Remove the ability to set a preferred setup activity.
 2015-06-09 17:12:27 +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
7349ee9dbf am b3cc45a1: am b99a1ac6: am 1162744f: Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev 
* commit 'b3cc45a1f53a6a88a736004c553ce417596bb440':
  Make public Network#bindSocket(FileDescriptor).
 2015-06-09 13:17:03 +00:00
Jim Miller
78b12521f3 am 0c9032ac: am 8caea094: am 800ebfc1: Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 
* commit '0c9032acaec1c0bba8f8e6e22892d463246e71b0':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:16:35 +00:00
Erik Kline
b3cc45a1f5 am b99a1ac6: am 1162744f: Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev 
* commit 'b99a1ac6d079211b9e889a08d61f60ff16eb0af7':
  Make public Network#bindSocket(FileDescriptor).
 2015-06-09 13:02:10 +00:00
Jim Miller
0c9032acae am 8caea094: am 800ebfc1: Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 
* commit '8caea094031b1b924f98cd73cc9b4fd68c3c9b0c':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:01:42 +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
800ebfc166 Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 2015-06-09 01:46:22 +00:00
Guang Zhu
73c380f379 am c04c5086: am a60e72ae: am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev 
* commit 'c04c50869c5935fe8c43d8b37e7ca426405477e4':
  clean up Process instance after we are done with the sub process
 2015-06-09 00:59:45 +00:00
Guang Zhu
c04c50869c am a60e72ae: am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev 
* commit 'a60e72ae2cc13e55d9c1af619437a6d18b8b7957':
  clean up Process instance after we are done with the sub process
 2015-06-09 00:49:02 +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
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
Jonathan Basseri
2ec7cd161f am d441f0bb: am 3efdf81d: am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit 'd441f0bb97a751f6ce1042431a7395eeb1d6b4c6':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 23:09:41 +00:00
Jonathan Basseri
d441f0bb97 am 3efdf81d: am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '3efdf81da089a4c6604c798a1abedb4fce70ee60':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:50:06 +00: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
1c4de6a1a4 am dd8ed093: am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit 'dd8ed09397cb3bcbc89b1864543854dc027c68c8':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 21:09:14 +00:00
Etan Cohen
dd8ed09397 am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '03609df355228390a98d5669cb1a53e83f8343a9':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:51:59 +00:00
Wale Ogunwale
92839dfe61 am 152b03e8: am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit '152b03e85260463fe00c1157a172f6e068261012':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:46:23 +00:00
Wale Ogunwale
152b03e852 am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit '549ac6925a28bf185515334a99cffb2048f0708a':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:37:43 +00:00
Andrew Flynn
6d0a068a47 am 9e2296e2: am 1292b596: am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '9e2296e2e02a779ef855f02fabac139869e443cc':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:34:42 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
Andrew Flynn
9e2296e2e0 am 1292b596: am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '1292b5961214229e893c09b8ca85ef1461a54737':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:21:33 +00:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Dianne Hackborn
143dd60bff am 82aa5f2c: am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '82aa5f2cf5b78a76c2bd1502f9ed9d995028f21a':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:15:32 +00:00
Mike Lockwood
6e48b76640 am e89f9d8a: am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'e89f9d8af721d2be7369f9c361cfa566f6a24757':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:15:26 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks. 
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
 2015-06-08 13:02:44 -07:00
Dianne Hackborn
82aa5f2cf5 am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '09653fc5ee5f2050f61e055d773d0f873c71b6db':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:02:02 +00:00
Mike Lockwood
e89f9d8af7 am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'ac4c704b4ef233f12c649f6e20794dd1aeb28a1d':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:01:57 +00: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
Andrew Flynn
6ada0efdbf am b98430c8: am b443bcce: am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'b98430c84b9afab1e6bbfab31d34502758f9ca82':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 19:57:00 +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
Tim Kilbourn
6b051cfe1b am 2f7d4b5f: am 59a1dd78: am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '2f7d4b5fb2e5df8396c20ff039bc2fbe58d3e39c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 18:38:41 +00:00
Clara Bayarri
4b41699a5e am f3860658: am e93a4631: am 2ea838d5: Merge "Remove insertion action mode runnable on selection start" into mnc-dev 
* commit 'f386065882e4e29bbb66eec41abe4ca7e8a8ced1':
  Remove insertion action mode runnable on selection start
 2015-06-08 18:38:35 +00:00
Tim Kilbourn
bff5a41235 am 6b3bb7d6: am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '6b3bb7d66966fd4c2ff99f2fc831970678a82de6':
  Pass an args bundle to launchAssistAction.
 2015-06-08 18:38:22 +00:00
John Spurlock
8a3188e8ea am 202dea41: am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev 
* commit '202dea4125f189e242da71c1378699321882671b':
  Zen: New user flow for requesting DND access.
 2015-06-08 18:38:15 +00:00
George Mount
bf927772c9 am 9a74b503: am ac74c77c: am 616bb3d5: Merge "API Council changes." into mnc-dev 
* commit '9a74b5030f04b4d4e6cc202d26ea7aeff4653ed5':
  API Council changes.
 2015-06-08 18:38:09 +00:00