Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,239 Commits 3 Branches 0 Tags
ebdafcbd1614b250edd5f5840b4e8e007f016bbf
Commit Graph

155239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
ebdafcbd16 am 518a54ae: am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '518a54aed60878329e5e5492f10820108a056d6a':
  Typo fixed in sample code
 2014-10-16 19:01:22 +00:00
David Friedman
f8e428dd68 am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'b0683f0c3f5eedb332a66203e4850f60eb83dcc5':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:00:16 +00:00
Rich Slogar
6b1edcd0c8 am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 
* commit '349e3640b784c277f983ec9c849db3131d135ccf':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:00:03 +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
Joe Fernandez
518a54aed6 am 7e19b402: am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '7e19b402c6651112a56ab8569ea53a7004a3a552':
  Typo fixed in sample code
 2014-10-16 18:42:16 +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
Joe Fernandez
7e19b402c6 am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-16 18:23:18 +00:00
David Friedman
b0683f0c3f am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 18:10:36 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +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
Rich Slogar
349e3640b7 am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 
* commit '70807ab128c544b972f3710e53eeedd0d40dce2a':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 17:15:23 +00:00
Rich Slogar
70807ab128 Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 2014-10-16 17:10:49 +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
Rich Slogar
54444f66a4 docs:Build and Platform Tools Updates for Android 5 
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
 2014-10-16 10:02:22 -07: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
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
Joe Fernandez
2f9ea27c6c am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
  Typo fixed in sample code
 2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8 Merge "Typo fixed in sample code" into klp-modular-docs 2014-10-16 14:34:47 +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
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
Dirk Dougherty
b175ee295e am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '41d5d14df218d2711be0b16b0f15ddd4cabf3a4f':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 05:52:04 +00:00
Geoff Mendal
7ef557764c am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e134ac1cece66293b31543948fbabc5b7fc64b94':
  Import translations. DO NOT MERGE
 2014-10-16 05:52:01 +00:00
Craig Mautner
49bb8cdc5e am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit 'd1a58c45fee09c5e599fe173d5055546fe147b03':
  Remove unnecessary logging.
 2014-10-16 05:51:56 +00:00
Eric Rowe
ea626e1af8 am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 05:51:52 +00:00
Craig Mautner
d1bba16da5 am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit '87441860bf4df2da7ce4537ad31c8240547da655':
  Move desired task to top if not already there.
 2014-10-16 05:51:48 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 05:51:45 +00:00
Evan Charlton
df88ad0b81 am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'e8a700e9f7956333df647eebe5e8c9eb1ea8c12c':
  Add WindowManager.aidl to AIDL list
 2014-10-16 05:51:41 +00:00
RoboErik
56d8876f4b am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '0dfd86e00656573cdd3e28742e93319c96f6ce15':
  Don't call size on a null metadata
 2014-10-16 05:51:37 +00:00
Christopher Tate
ce39d25f2c am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts
 2014-10-16 03:36:34 +00:00
Christopher Tate
185fcadf89 Merge "Fix spurious restore session timeouts" into lmp-dev 2014-10-16 03:29:00 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00