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

11119 Commits

Author SHA1 Message Date
Martijn Coenen
ab428b87f2 am 0c2d3d93: am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '0c2d3d93dd2f8f0e355299188a8a77b5287b150f':
  Make peer LLCP version an int.
 2015-06-10 07:34:42 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Svetoslav
ba338ecc2a am 54dd1e4c: am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '54dd1e4c7320e5e9466194ebb3e8cbf45ddfd336':
  Use who when requesting permissions
 2015-06-10 02:05:55 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Dianne Hackborn
098e4bf040 am 45c75dea: am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '45c75dea7f1c03e4e899e5316785731b91daf85b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:14:03 +00:00
Zheng Fu
50ef8f5eb6 Merge "un-hide raw_contacts.backup_id and expose metadatasync to system." 2015-06-10 00:06:04 +00:00
Zheng Fu
7997bee366 un-hide raw_contacts.backup_id and expose metadatasync to system. 
Bug:18930508
Change-Id: I37eb7ca41416becb549ebe5b1986925952a943c9
 2015-06-09 16:50:02 -07:00
Paul Miller
1bb1f05144 am d8d9a0b2: am 057491d6: am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit 'd8d9a0b20ff61bfb4ba544958445236806cf0cf8':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:42:08 +00:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request 
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
 2015-06-09 14:15:49 -07:00
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Yorke Lee
1cf9a15922 am 3a7645cc: am 013b32b9: am 03123839: Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 
* commit '3a7645ccd460f2ff283d0e36b6a9d0c4a48fbdc5':
  Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS
 2015-06-09 20:47:44 +00:00
Yorke Lee
03123839e4 Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 2015-06-09 20:09:57 +00:00
Yorke Lee
02fb5bc52b Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS 
Bug: 19696065
Change-Id: Ibe253c8cd66938ea1cd560d443008026eb1005d9
 2015-06-09 12:28:06 -07:00
Eino-Ville Talvala
284861e3a3 am d2556db0: am e99f6711: am 7b7e1f97: Merge "ExifInterface: Add a few tag fields." into mnc-dev 
* commit 'd2556db0bf3fa2d7c67b4a38b0d6ed3d11a8b7c2':
  ExifInterface: Add a few tag fields.
 2015-06-09 18:58:55 +00:00
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
Paul Miller
c8694a082a Deprecate WebView scrollbar overlay API 
Deprecate setHorizontalScrollbarOverlay, setVerticalScrollbarOverlay,
overlayHorizontalScrollbar, and overlayVerticalScrollbar. They've been
no-ops for years, ever since WebViewChromium.

BUG:21642246
Change-Id: Ia1062c53fdbaa7a0d282ba79da733a6f3b9ac84f
 2015-06-09 11:48:01 -07:00
Eino-Ville Talvala
7b7e1f97aa Merge "ExifInterface: Add a few tag fields." into mnc-dev 2015-06-09 18:29:08 +00:00
Andreas Gampe
2c936af815 Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 2015-06-09 18:20: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
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
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
Alex Klyubin
2b214033e2 am b3ac4a77: am 72d66afe: am 12742ab5: Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 
* commit 'b3ac4a771a06e8e480de6a80fd45b2a0aad11ff5':
  Deprecate KeyChain.isBoundKeyAlgorithm.
 2015-06-09 01:23:42 +00:00
Alex Klyubin
12742ab5f4 Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 2015-06-09 00:51:28 +00:00
Zach Johnson
1e4fcd4f3b am 26b21a6c: am ea9f961c: am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit '26b21a6cef4e3acd3768619f1f88ec6d1096bfd6':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:34:03 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +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
Eino-Ville Talvala
ab60e7e6e0 ExifInterface: Add a few tag fields. 
Since these are being CTS tested, they should be public.

Bug: 21568414
Change-Id: I3f9f6e5da240b2ac0b2b88b5d25ec3c8c4704b8d
 2015-06-08 15:28:09 -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
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness 
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
 2015-06-08 13:49:13 -07: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
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
Alex Klyubin
469cbf5156 Deprecate KeyChain.isBoundKeyAlgorithm. 
This is bad API. There was never a guarantee that when this method
returns true for a key algorithm (e.g., RSA or EC), then all keys of
that type will be imported into secure hardware. For example, the
secure hardware may reject a key if it's of unsupported size or uses
an unsupported public exponent or EC curve. In that case, the key
will be imported into keystore/KeyChain without being backed by secure
hardware.

Bug: 18088752
Change-Id: I8daa574a2e703a347d09d93401cd1ea2d0162ed9
 2015-06-08 13:22:53 -07: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
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