drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,960 Commits 1 Branch 0 Tags
Commit Graph

192960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
3dd9bbf8e7 Merge "Add intents for enabling phone accounts." into mnc-dev 2015-05-21 17:32:51 +00:00
Chad Brubaker
431eac49aa Merge "Cleanup Keystore API" into mnc-dev 2015-05-21 17:26:45 +00:00
Clara Bayarri
b5611f555d Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev 2015-05-21 17:24:14 +00:00
Narayan Kamath
6bd37924b6 Merge "Fix application moves." into mnc-dev 2015-05-21 17:23:17 +00:00
Luan Nguyen
0e7fa9e32a docs: Update the AlwaysOn sample link to point to DAC's samples 
Change-Id: I54e2457009ef561c49a042e2a65fa55808a370bf
 2015-05-21 10:09:24 -07:00
Clara Bayarri
92c8e6f4a3 Update the PROCESS_TEXT action javadoc to include types 
Bug: 21343771
Change-Id: If1d64ba121555863022cecc7a7b3d94c866e8715
 2015-05-21 17:58:27 +01:00
Clara Bayarri
e95cc176bb Update the documentation for ActionMode.Callback2#onGetContentRect 
Received feedback from a team that it was not clear what the rect
had to include.

Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1
 2015-05-21 17:45:19 +01:00
Jean-Michel Trivi
59845bef8e Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev 2015-05-21 16:24:02 +00:00
Paul McLean
d6c3404f59 Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev 2015-05-21 16:21:48 +00:00
Leon Scroggins III
462dd01046 Fix overflow in NinePatchImpl. 
Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().

BUG:20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8
 2015-05-21 12:20:26 -04:00
Paul McLean
cef696e8b4 Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice(). 
Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
 2015-05-21 09:16:40 -07:00
Jean-Michel Trivi
e6b874b1aa Merge "Fix reading attributes for playback restrictions" into mnc-dev 2015-05-21 16:16:19 +00:00
Xiyuan Xia
e695b59eb5 Merge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev 2015-05-21 16:15:51 +00:00
Eric Laurent
97de0c9a29 Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev 2015-05-21 16:13:04 +00:00
Luan Nguyen
98ebcef18b docs: Add sample links and descriptions for M Preview 
bug: 20910953
Change-Id: Ia4c04357b2e6c772ebf98b463c06a7eadb1ff893
 2015-05-21 08:22:01 -07:00
Joe Fernandez
18cc51d6df am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2 
* commit '23fcc39e419c74533697cc9858709e681266830a':
  docs: M Preview downloads and SDK Setup pages v2
 2015-05-21 14:16:39 +00:00
Luan Nguyen
d8573aa517 am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs 
* commit 'dfa79aeb6fd119127b790704c30f2d27b464b4a8':
  docs: Refresh Wearable support library reference for Diamond
 2015-05-21 14:16:34 +00:00
Luan Nguyen
f644f70208 am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs 
* commit '6d592518b863e5cbdb6542003377f4e2bf254be2':
  docs: Remove references to Android Studio 0.8 beta
 2015-05-21 14:16:29 +00:00
Luan Nguyen
6a4d4a46f2 am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs 
* commit '2801c77ef3f76092ae4ef8b1888bc26399ba9188':
  docs: Add Always-On lesson for Wear apps
 2015-05-21 14:16:24 +00:00
Luan Nguyen
0444253e69 am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs 
* commit '94587871d26067a50d4a0a975f6ee6a7eed6f0bd':
  docs: Add always-on design for wearable activities
 2015-05-21 14:16:13 +00:00
Geoff Mendal
d457c71eca Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:28:24 +00:00
Geoff Mendal
8d0891d05d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:22:41 +00:00
Narayan Kamath
cd251fa382 Fix application moves. 
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.

This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.

bug: 21337469

Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d
 2015-05-21 14:22:21 +01:00
Baligh Uddin
c03190a48e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:20:22 +00:00
Baligh Uddin
7261a90c12 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:20:22 +00:00
Baligh Uddin
376723e219 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:20:17 +00:00
Baligh Uddin
39effd54d7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:20:12 +00:00
Geoff Mendal
2bfe0ae0bc Import translations. DO NOT MERGE 
Change-Id: I243054bfdbe5bae12a1b3eb9f26d7bb158681ae0
Auto-generated-cl: translation import
 2015-05-21 06:17:30 -07:00
Geoff Mendal
3c7227abdc Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-21 13:16:24 +00:00
Geoff Mendal
70c6587903 Import translations. DO NOT MERGE 
Change-Id: I68ce431c2c547d2192d007d8ac5af599dd5cf1ff
Auto-generated-cl: translation import
 2015-05-21 06:13:24 -07:00
Geoff Mendal
dc038f3246 Import translations. DO NOT MERGE 
Change-Id: Ibc636bc980ceaead21d2eaf2dd813de284341ab0
Auto-generated-cl: translation import
 2015-05-21 06:10:03 -07:00
Erik Kline
cd7ed16f00 LinkProperties function to compare provisioning and remove DNS servers 
Adds:
    - enum ProvisioningChange
    - LinkProperties#compareProvisioning()
          return a ProvisioningChange value describing the delta in
          provisioning between two LinkProperties objects
    - LinkProperties#removeDnsServer()
    - make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()

Bug: 18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
 2015-05-21 20:43:47 +09:00
Johan Euphrosine
b1baab6858 frameworks/base/docs: add jd files for NDK reference 
Generated using:
https://android-review.googlesource.com/#/c/151627/

Change-Id: Ib4840ef370d6b254da4f0b8f7b972608828b0d0e
 2015-05-21 01:28:48 -07:00
The Android Automerger
48b1bd2dff merge in mnc-release history after reset to mnc-dev 2015-05-21 01:03:02 -07:00
Jae Seo
184016aac0 Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev 2015-05-21 05:27:09 +00:00
Baligh Uddin
e68fed4568 Import translations. DO NOT MERGE 
Change-Id: Ie0f7cbb03d74e7c84ed90084d69a3d663f41214b
Auto-generated-cl: translation import
 2015-05-20 21:59:08 -07:00
Baligh Uddin
7ded358368 Import translations. DO NOT MERGE 
Change-Id: I2e800db526beb320e54c5f80ba8f8bf6a81391e0
Auto-generated-cl: translation import
 2015-05-20 21:54:23 -07:00
Jae Seo
76976fae6f TIF: Build the list of available TV inputs as the current user 
Bug: 21313985
Change-Id: I8aa881570915d14d63e4ac0b8034044f8736443b
 2015-05-20 21:52:28 -07:00
Baligh Uddin
a81a008e8e Import translations. DO NOT MERGE 
Change-Id: I92f614dd62de9ce0ad34cfaf7f24663dc9522eb4
Auto-generated-cl: translation import
 2015-05-20 21:51:28 -07:00
Baligh Uddin
763f5e8dca Import translations. DO NOT MERGE 
Change-Id: Ib2ff568b531a2273366145275de4b2ab936703e4
Auto-generated-cl: translation import
 2015-05-20 21:49:20 -07:00
Chet Haase
4b901c4506 Merge "Fix docs to not refer to non-public classes." into mnc-dev 2015-05-21 04:47:42 +00:00
Joe Fernandez
23fcc39e41 docs: M Preview downloads and SDK Setup pages v2 
Change-Id: I149061fc41d805722171f037cf62f8c64bffdefe
 2015-05-20 21:40:31 -07:00
Keisuke Kuroyanagi
27a6361234 Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev 2015-05-21 04:07:57 +00:00
John Spurlock
dbf2cd1660 Merge "Volume: Include a11y bit in dialog dump." into mnc-dev 2015-05-21 03:35:12 +00:00
John Spurlock
84ee67ce70 Volume: Include a11y bit in dialog dump. 
Bug: 21340132
Change-Id: Ie9a347e7e0f08c7019b4a483a3a87a8cba6f37da
 2015-05-20 23:33:43 -04:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev 
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
 2015-05-20 20:15:29 -07:00
Filip Gruszczynski
479b1c77ce am 037c9cac: Merge "Fix build." into cw-d-mr1-dev 
* commit '037c9caccdc98bfe9d952e797535611c791787aa':
  Fix build.
 2015-05-21 02:55:33 +00:00
Filip Gruszczynski
037c9caccd Merge "Fix build." into cw-d-mr1-dev 2015-05-21 02:41:08 +00:00
Filip Gruszczynski
c1b736a0cd Fix build. 
Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
 2015-05-20 19:40:27 -07:00
Jean-Michel Trivi
42697ffd42 Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags 
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
  AudioAttributes flags that will be used when playing the
  Ringtone.

Bug 19407114

Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
 2015-05-20 19:14:45 -07:00