Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,724 Commits 3 Branches 0 Tags
faa50c7364be134fe9e65d5d0e8d8a8bdbcfbe4b
Commit Graph

41826 Commits

Author SHA1 Message Date
Ben Murdoch
faa50c7364 am fe970ad5: am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit 'fe970ad538dd830f81889681fb84d4e3e0f6c8f3':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:54:38 +00:00
destradaa
ba3ef85d14 am 4ec6c891: am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit '4ec6c891748475f35966a612abad18a03ddae88a':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:54:30 +00:00
Andres Morales
67700b288a am 6108899c: am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '6108899c4b03dc08f58df858d670b1de187bfe71':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:54:21 +00:00
Zhijun He
96da0ae9c7 am 5cb48006: am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '5cb480063294ca1f721240465e4e1f92bf1e4a71':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:54:17 +00:00
Ben Murdoch
3aa88cd61a am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:48:26 +00:00
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:47:52 +00:00
Zhijun He
3ddb88ecd3 am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '3bce07590a097d2e904daa549e3083415e3c4051':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:47:45 +00:00
Eino-Ville Talvala
ef33384939 am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 21:06:22 +00:00
Chris Craik
a4ca835624 am a383d6e3: am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'a383d6e3a23cb97b5102a75b6ac9010ee170cb43':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 21:06:10 +00:00
Amith Yamasani
68265b0740 am 840e1535: am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '840e1535b9e607be177241552a08ac2b1cb236d6':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 21:06:05 +00:00
Adam Powell
f8c8fc4c27 am 702f8297: am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '702f82972600b6b78d5fee1d2511488ad405a1b1':
  Add nested pre-fling for nested scrolling
 2014-07-17 21:06:00 +00:00
Ruben Brunk
f89631e1d8 am b66e3aae: am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'b66e3aae34e2ad9a5a6b9b5904f1ca4ebc101a73':
  camera2: Fix swapped Face detection commands.
 2014-07-17 21:05:47 +00:00
Christopher Tate
4cbb4469e6 am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 21:05:25 +00:00
Adam Connors
fd259886cd am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
  Create DPM APIs for cross profile callerId
 2014-07-17 21:05:08 +00:00
Martin Kosiba
9ab6dbc624 am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager. 
* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
  Allow for appending of resources to an AssetManager.
 2014-07-17 21:04:53 +00:00
Alexandra Gherghina
55144e0e21 am ea887ed3: am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit 'ea887ed3d19f744c83effb13347bc0a69e75f005':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 21:04:49 +00:00
Eino-Ville Talvala
aff282506f am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 20:59:30 +00:00
Chris Craik
e7edf9587e am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5 am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
  Add nested pre-fling for nested scrolling
 2014-07-17 20:58:56 +00:00
Ruben Brunk
e5d53bd1ba am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
  camera2: Fix swapped Face detection commands.
 2014-07-17 20:58:38 +00:00
Christopher Tate
be786a1f69 am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 20:58:09 +00:00
Adam Connors
f8904a2b43 am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
  Create DPM APIs for cross profile callerId
 2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570 am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 20:57:50 +00:00
Martin Kosiba
0db75fe2b0 am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager. 
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
  Allow for appending of resources to an AssetManager.
 2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 20:57:31 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition 
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
 2014-07-17 20:42:04 +00:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling 
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
 2014-07-17 11:37:59 -07:00
Julia Reynolds
7a387c5dac am 6a1230cf: am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev 
* commit '6a1230cfcc8f6c9920d06e6ac2ec8dcf39903cf2':
  Update message on DISALLOW_REMOVE_USERS constant.
 2014-07-17 18:29:16 +00:00
Torne (Richard Coles)
daa5b63ff6 am a6eb6ece: am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library. 
* commit 'a6eb6eceb0330508af47f4de697df7c7b85e5410':
  Use the WebView's loader library to load the real library.
  Remove WebView library preloading mechanism.
 2014-07-17 18:29:12 +00:00
Przemyslaw Szczepaniak
9caab369fe am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev 
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
  Add AudioAttributes support in the TTS.
 2014-07-17 18:23:39 +00:00
Dianne Hackborn
bf507a0cba am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView... 
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
  Implement issue #16330060: Inform ActivityManager about WebView...
 2014-07-17 18:22:17 +00:00
Sandeep Siddhartha
a25b93b226 am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata 
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
  Add recognition modes to the enrollment metadata
 2014-07-17 18:22:07 +00:00
Alan Viverette
238673f33a am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling 
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
  Add public attributes for TimePicker styling
 2014-07-17 18:21:59 +00:00
Sandeep Siddhartha
177f0fd208 am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues 
* commit 'a2440a17e796d04ceb3470783d28f6080ee9c7dc':
  Add code for isKeyphraseActive and some logging to help debug issues
 2014-07-17 18:21:44 +00:00
Lorenzo Colitti
e1524a4896 am 84641420: am 1098531c: Disable logging in NetlinkTracker. 
* commit '84641420220d2d11e7baa7ae6061d78f31d97c98':
  Disable logging in NetlinkTracker.
 2014-07-17 18:21:31 +00:00
Chris Craik
b7f22787ef am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev 
* commit '3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
  Add accessibility text contrast setting
 2014-07-17 18:21:26 +00:00
Vinit Deshpande
b42cf4ea56 am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev 
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
  Introduce RTT Manager
 2014-07-17 18:20:48 +00:00
Jeff Davidson
d66291503a am 62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev 
* commit '62152268d51b8b7726a806e48750a810e23eab40':
  Expose network scoring APIs to /system apps.
 2014-07-17 18:20:22 +00:00
Brian Colonna
1e97b542d9 am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings 
* commit '6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
  Bug 16152902: Disabling FUL in keyguard and screen lock settings
 2014-07-17 18:17:55 +00:00
Fabrice Di Meglio
fcc5aaf486 am 6bbea8cf: Fix LocalePicker background 
* commit '6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
  Fix LocalePicker background
 2014-07-17 18:15:08 +00:00
Alan Viverette
6bf5ae966f am 8e97a200: Fix software dirty region, don\'t add insets to software windows 
* commit '8e97a200ecf1985dcf2fd3a004b53e59640b3374':
  Fix software dirty region, don't add insets to software windows
 2014-07-17 18:14:28 +00:00
Yigit Boyar
2c6cdd9500 am d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev 
* commit 'd8607b40b57332619f3be66ffa5250394acbc5f7':
  Change Animators to reset values when restarted if their target changes
 2014-07-17 18:14:23 +00:00
John Reck
52d2b2df9d am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev 
* commit 'c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
  Fix root RenderNode damage calculation
 2014-07-17 18:14:18 +00:00
Ben Murdoch
dc00a84af1 Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast. 
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
 2014-07-17 21:18:40 +00:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6 Camera2: replace partial quirks with normal partial result 
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
 2014-07-17 20:08:32 +00:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack. 
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
 2014-07-17 11:09:46 -07:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master 
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
 2014-07-17 11:05:42 -07:00