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

156361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
3b278f61fb am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
automerge: 11014fe

* commit '11014feaed47ef28c0f7782463f99d181261774a':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 19:08:37 +00:00
Andrew Solovay
11014feaed am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 18:59:59 +00:00
Scott Rowe
f1b9b1f992 am f83c56cd: am a3bc95c5: am 8f93624e: docs: delete preview pages 
* commit 'f83c56cd425099e35dab81f01d1892abffc7f72f':
  docs: delete preview pages
 2014-10-16 18:39:55 +00:00
Prerepa Viswanadham
2e8beaed54 am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '06819409c673b6f93c1df9f7d6949f623ff67192':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:39:51 +00:00
Lorenzo Colitti
dc14068a7d am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'e526668eae7ba79e9558cb2b34486bbae2403fd5':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 18:39:46 +00:00
Lorenzo Colitti
b7ba3e21e2 am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit '94dbc64c9871d394fc7038c95cc140c52ad35255':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 18:39:41 +00:00
Lorenzo Colitti
03c0c78575 am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '5fa2929f161164c8040a1b1ab35b04d43de6374c':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 18:39:37 +00:00
Christopher Tate
d1ec1c4715 am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit '31e4eeb26f2c843d141f969271cff8e825909788':
  Fix spurious restore session timeouts
 2014-10-16 18:39:32 +00:00
Scott Rowe
f83c56cd42 am a3bc95c5: am 8f93624e: docs: delete preview pages 
* commit 'a3bc95c50638b869a4d9aa8b0fefb6862b8cdc05':
  docs: delete preview pages
 2014-10-16 18:35:40 +00:00
Prerepa Viswanadham
06819409c6 am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:35:33 +00:00
Lorenzo Colitti
e526668eae am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'd04d6c91a311af7a52f05fac5935c9327a990046':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 18:35:21 +00:00
Lorenzo Colitti
94dbc64c98 am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit 'ffd7335088d228ac0c56fdc7e2faba79c78572bf':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 18:35:18 +00:00
Lorenzo Colitti
5fa2929f16 am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 18:35:14 +00:00
Christopher Tate
31e4eeb26f am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts
 2014-10-16 18:34:56 +00:00
Geoff Mendal
a9e131ce28 am c218d8f1: (-s ours) am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c218d8f19881deed098875e2caf41b7ca9e42133':
  Import translations. DO NOT MERGE
 2014-10-16 17:56:38 +00:00
Brian Carlstrom
fe6cde379a am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '6580c273a51daee08972149f2d2ede8ef6e7a79a':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:56:33 +00:00
Geoff Mendal
299c69078b am 551deffb: (-s ours) am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '551deffb7679e893ee8df750914cdb978bf2afb5':
  Import translations. DO NOT MERGE
 2014-10-16 17:56:28 +00:00
Marco Nelissen
d3a62f1b6e am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit 'a2d77ed7d7abc1cf10fb961dd8a64f3a9e323736':
  Also consider secondary storage when verifying paths
 2014-10-16 17:56:21 +00:00
Dirk Dougherty
07d717affc am 7e4a3aec: am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '7e4a3aecbd9ebc3c91a50eacfe24293811338df9':
  Doc change: Add diffs for API level 21.
 2014-10-16 17:56:16 +00:00
Geoff Mendal
c218d8f198 am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '00e4d7830cc7834efdcec2a35d130cbc89e16551':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:58 +00:00
Brian Carlstrom
6580c273a5 am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:45:54 +00:00
Geoff Mendal
551deffb76 am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'fb0356852dad1daeb673cdf117193a8421f66aaa':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:45 +00:00
Marco Nelissen
a2d77ed7d7 am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths
 2014-10-16 17:45:36 +00:00
Dirk Dougherty
7e4a3aecbd am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '0cd670b39be13e1840927694b36d6c61e5c7c1dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 17:45:31 +00:00
Andrew Solovay
0b7e1bafe5 am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 
* commit '34ef4ff9b7a3625477b0eccd20db15129f2732f3':
  Moved TV Input Framework (TIF) page out of preview.
 2014-10-16 17:08:33 +00:00
Andrew Solovay
34ef4ff9b7 Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 2014-10-16 17:03:02 +00:00
Scott Rowe
a3bc95c506 am 8f93624e: docs: delete preview pages 
* commit '8f93624eafd3518d97c88506bbb9a93c81eb7f03':
  docs: delete preview pages
 2014-10-16 16:44:30 +00:00
Scott Rowe
8f93624eaf docs: delete preview pages 
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
 2014-10-16 09:39:04 -07:00
Prerepa Viswanadham
56302744c4 am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96 Update javadoc comments for getBluetoothLeAdvertiser() 
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
 2014-10-16 16:06:44 +00:00
Adrian Roos
c344cdc1bb am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 14:56:40 +00:00
Adrian Roos
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
George Mount
27a08f2ad5 am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit 'ea6f0ae86d62cff88d63b926578c588a956d0512':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:25:45 +00:00
George Mount
ea6f0ae86d Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 2014-10-16 14:21:43 +00:00
Lorenzo Colitti
d04d6c91a3 am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'b7d8514822aefbf8274f5464dc12cee151e2b78b':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 09:23:24 +00:00
Lorenzo Colitti
ffd7335088 am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit '917c547beb9adecf2e7d2b355e85e37c2557c5d3':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 09:23:21 +00:00
Lorenzo Colitti
24f9a26cea am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 09:23:17 +00:00
Lorenzo Colitti
b7d8514822 Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 2014-10-16 08:46:10 +00:00
Lorenzo Colitti
917c547beb Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev 2014-10-16 08:45:03 +00:00
Lorenzo Colitti
28dcf0345b Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 2014-10-16 08:37:28 +00:00
Quddus Chong
e58249f84a am 7ef4ba61: am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '7ef4ba61c83871ea02df760729524bfc7c27b8a9':
  docs: Added L API overview.
 2014-10-16 06:49:52 +00:00
Dirk Dougherty
382170af6d am b175ee29: am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit 'b175ee295e4e159ca5ac062f7732a5c785c9133b':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 06:49:47 +00:00
Geoff Mendal
08d339fc20 am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7ef557764c27efc5766c849b4982c70d05864dfe':
  Import translations. DO NOT MERGE
 2014-10-16 06:49:43 +00:00
Craig Mautner
45e0baf333 am 49bb8cdc: am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '49bb8cdc5ecf42bdb66d948a900bee10de1c8323':
  Remove unnecessary logging.
 2014-10-16 06:49:38 +00:00
Eric Rowe
1e684b3ded am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'ea626e1af8019786d514d3de0b8a1fa274ca424c':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 06:49:34 +00:00
Craig Mautner
2ecd9de2d5 am d1bba16d: am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'd1bba16da53f927792f489057c1d477b8079876e':
  Move desired task to top if not already there.
 2014-10-16 06:49:29 +00:00
John Spurlock
c824a9d444 am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '4f7eee438be7e51d7988a2a61123139e74b7b802':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:49:24 +00:00
Evan Charlton
e3d3aa3f38 am df88ad0b: am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'df88ad0b81b8b1a6ca76d5961632717165594e9f':
  Add WindowManager.aidl to AIDL list
 2014-10-16 06:49:20 +00:00
RoboErik
5e1b92c054 am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '56d8876f4b9a1a43e4eed0d8b1afff26331cf095':
  Don't call size on a null metadata
 2014-10-16 06:49:16 +00:00
Quddus Chong
7ef4ba61c8 am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '073c80d346e053532092efec9c2c12a3a39d2dcd':
  docs: Added L API overview.
 2014-10-16 05:52:08 +00:00