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

10952 Commits

Author SHA1 Message Date
Jeff Davidson
d2c4d9a894 am a66a067a: Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev 
* commit 'a66a067a9c9b706035f48f445561100f29c960bf':
  Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
 2015-06-11 15:43:23 +00:00
Jason Monk
0a2f637531 am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '253ee76dd9da2cda043d113f247b3c8acf915d77':
  Add action for reaching ignore battery optimizations
 2015-06-11 15:39:43 +00:00
Ben Kwa
2d5c9c368e am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'c783a5e762b0c4925756b8ca273eb26aab5e7985':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-11 15:38:09 +00:00
Andrew Flynn
64af0511ca am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-11 14:48:29 +00:00
Jeff Davidson
a66a067a9c Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev 2015-06-10 22:40:29 +00:00
Jason Monk
287b889f93 Add action for reaching ignore battery optimizations 
Bug: 21375688
Change-Id: I1477192371aae2f3497fd49ad704de183ed836a3
 2015-06-10 15:38:47 -04:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list. 
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
 2015-06-10 11:24:55 -07:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Martijn Coenen
5b7041ae4a am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '706f23ddb9f18663d5ae70626e118e815a308c84':
  Make peer LLCP version an int.
 2015-06-10 07:09:08 +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
e22b616440 am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit 'a1e60f1f45dce19f9dc15b97cbb0821ffeb54d9d':
  Use who when requesting permissions
 2015-06-10 01:42:58 +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
1a21134c02 am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '476695227393b6c35c6777754b0e3b6448ceb7d2':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-09 23:47:11 +00:00
Jeff Davidson
0cf20cdf81 Mark CARRIER_PRIVILEGE_* constants as @SystemApi. 
These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
 2015-06-09 14:40:21 -07: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
f6cd3f0f1d am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '87a19e25fe736a0fe92a0b4e8490136350519393':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:13:26 +00:00
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService 
Re-checkin of 7f8be9d89b.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
 2015-06-09 16:28:54 -04:00
Yorke Lee
fafd719191 am 03123839: Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 
* commit '03123839e46f329018bb6216070abe62fd2b7175':
  Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS
 2015-06-09 20:20:56 +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
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
a677a10587 am 7b7e1f97: Merge "ExifInterface: Add a few tag fields." into mnc-dev 
* commit '7b7e1f97aac70b47b5faae5aa1db142275ee0518':
  ExifInterface: Add a few tag fields.
 2015-06-09 18:37:47 +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
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
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
Alex Klyubin
d338fc6ce4 am 12742ab5: Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 
* commit '12742ab5f4e93ae8b37d861c30c10972746adaed':
  Deprecate KeyChain.isBoundKeyAlgorithm.
 2015-06-09 00:59:18 +00:00
Alex Klyubin
12742ab5f4 Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 2015-06-09 00:51:28 +00:00
Zach Johnson
bbc2568ee1 am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:14:55 +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
9da4d7d5fc am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:36:07 +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
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
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