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

151793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
bfc4524e5e am f3934d0c: am bfb8310a: Merge "Notify VM of native pixelref allocations" into lmp-dev 
* commit 'f3934d0c2de9324bb4d0428767a096248aa161da':
  Notify VM of native pixelref allocations
 2014-08-26 22:11:54 +00:00
Jeff Sharkey
971c5910e7 am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '232aac5cc0313a94ce3c96bd0f3a13e0b70c9a36':
  Report FileBridge failures as wtf().
 2014-08-26 22:01:00 +00:00
vandwalle
fb9cf903fb am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:00:54 +00:00
Christoph Studer
0a2980b83a am b3326cdc: am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'b3326cdcecd593fa1b2cd4ce117a86d46927b309':
  NoMan: Cancel children when update removes summary
 2014-08-26 22:00:44 +00:00
Christoph Studer
b3196d3327 am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'deefd53448758914da3c943e0cff751fc5f783fc':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:00:25 +00:00
Christoph Studer
ad486ef172 am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '483086029fe7556903e0b4131c6fedf9f8690fa5':
  Notification: Optimize L icon processing
 2014-08-26 22:00:14 +00:00
Christoph Studer
f39747718b am d61d9a04: am 15c6ad7b: Merge "SysUI: Uprank current media notification" into lmp-dev 
* commit 'd61d9a04458008ba11d0ae7a50126e7c711961f0':
  SysUI: Uprank current media notification
 2014-08-26 22:00:09 +00:00
Chris Craik
8750c37d84 am bfb8310a: Merge "Notify VM of native pixelref allocations" into lmp-dev 
* commit 'bfb8310ab2214c19e955121373217edfe7258ebd':
  Notify VM of native pixelref allocations
 2014-08-26 21:59:27 +00:00
Jay Shrauner
87677d63a1 am 69f81c5a: am 667e1f9a: Merge "Fix NPE when have no phone accounts" into lmp-dev 
* commit '69f81c5ae61724a6fedb4b18081aa1517dcf34e3':
  Fix NPE when have no phone accounts
 2014-08-26 21:51:12 +00:00
Baligh Uddin
b59d2624f0 am da59441d: (-s ours) am 4e0f22cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'da59441d4d7396508ff958e61446cee08ef4dd3a':
  Import translations. DO NOT MERGE
 2014-08-26 21:51:07 +00:00
Baligh Uddin
b31378cb23 am ff1c95c1: (-s ours) am 79878df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ff1c95c15612a500026a7d77eb5b924e2e03cdf1':
  Import translations. DO NOT MERGE
 2014-08-26 21:51:03 +00:00
Jeff Sharkey
7b13ce85bd am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '64c535003d257acf781efa3d0b08d463a5f38e82':
  Report FileBridge failures as wtf().
 2014-08-26 21:50:16 +00:00
vandwalle
c59ecafa85 am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit 'bdc65df3860cf5f4aae9c79ad14f035626689bfa':
  remove passpoint - DO NOT MERGE
 2014-08-26 21:50:02 +00:00
Christoph Studer
6b6c6aa2e2 am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'fc00943b1addb1f6e1ded0476db4669615cce7c5':
  NoMan: Cancel children when update removes summary
 2014-08-26 21:49:57 +00:00
Christoph Studer
1fa2947df7 am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit '7e637d1e94badfe06f99abfc81b03c974f557ee5':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 21:49:51 +00:00
Christoph Studer
acecce7921 am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit 'e25ac583c0016616cfa145734816675e26354d32':
  Notification: Optimize L icon processing
 2014-08-26 21:49:39 +00:00
Christoph Studer
54ebef6da8 am 15c6ad7b: Merge "SysUI: Uprank current media notification" into lmp-dev 
* commit '15c6ad7bc58ba3a9e88cfdbd1a8b31053986fca9':
  SysUI: Uprank current media notification
 2014-08-26 21:49:34 +00:00
Chris Craik
b34eeb70a6 Merge "Notify VM of native pixelref allocations" into lmp-dev 2014-08-26 21:47:46 +00:00
Jeff Sharkey
7837dac462 Merge "Report FileBridge failures as wtf()." into lmp-dev 2014-08-26 21:27:11 +00:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
Jeff Sharkey
d3ca991700 Report FileBridge failures as wtf(). 
Bug: 17183379
Change-Id: Ifd4dc690c04439e1f7abebd8e0ca4e1ff97d9cc8
 2014-08-26 14:23:28 -07:00
Christoph Studer
f50d82a1e4 Merge "NoMan: Cancel children when update removes summary" into lmp-dev 2014-08-26 21:17:18 +00:00
Christoph Studer
faa9957fd3 Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 2014-08-26 21:16:22 +00:00
Jay Shrauner
8e5d014cc5 am 667e1f9a: Merge "Fix NPE when have no phone accounts" into lmp-dev 
* commit '667e1f9a843428f915d5e63a694e3f5dbd894dd4':
  Fix NPE when have no phone accounts
 2014-08-26 21:16:15 +00:00
Baligh Uddin
37e504e943 am 4e0f22cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4e0f22cf634d5d39fb4e1f386eea3f0306a98e7a':
  Import translations. DO NOT MERGE
 2014-08-26 21:16:11 +00:00
Baligh Uddin
524ef1d69a am 79878df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '79878df786ef25ad70f6535c6278f2439d8ae249':
  Import translations. DO NOT MERGE
 2014-08-26 21:16:07 +00:00
Christoph Studer
6b6e9e05d3 Merge "Notification: Optimize L icon processing" into lmp-dev 2014-08-26 21:15:27 +00:00
Christoph Studer
7f05a69637 Merge "SysUI: Uprank current media notification" into lmp-dev 2014-08-26 21:14:16 +00:00
Jay Shrauner
f196e3fe45 Merge "Fix NPE when have no phone accounts" into lmp-dev 2014-08-26 21:04:33 +00:00
Baligh Uddin
25f6868665 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-26 21:03:36 +00:00
Baligh Uddin
cb54f6dfff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-26 21:03:27 +00:00
vandwalle
10d3d97b56 am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev 
* commit 'dbf54ec22d1215cdf9991b79ecef8b17b9e58fe0':
  add radio stats to link layer
 2014-08-26 21:02:29 +00:00
Jay Shrauner
7746a94fd6 Fix NPE when have no phone accounts 
Return empty List instead of null so calling functions don't throw NPE
when dereferencing return value.

Bug:17282683
Bug:17262485
Change-Id: Ica4952b11a8af28787a4a0b6a991ab888386aa7b
 2014-08-26 21:01:18 +00:00
vandwalle
ebac77c6ab am b2139607: Merge "add radio stats to link layer" into lmp-dev 
* commit 'b213960786995482951ebf0b89610bf303688f10':
  add radio stats to link layer
 2014-08-26 20:55:42 +00:00
Jae Seo
1ec210673c am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit 'f6ee08469a2bffc6464ad34932c1e41105e2c7fe':
  TIF: Make TV content rating names consistent
 2014-08-26 20:50:43 +00:00
Jeff Sharkey
5784e197a8 am f3f849d1: am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit 'f3f849d1dffccf8f2e60e33f38085aae503bdd51':
  Treat moving app as installing in new location.
 2014-08-26 20:50:34 +00:00
vandwalle
242540d9ea Merge "add radio stats to link layer" into lmp-dev 2014-08-26 20:46:19 +00:00
Jae Seo
1a9e75d8b3 am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit '54f4fd7d5c5280276037ca0d90645beba0ea89ac':
  TIF: Make TV content rating names consistent
 2014-08-26 20:40:07 +00:00
Jeff Sharkey
63285a6419 am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit '206f982b7cedd90856eeeeab0acdef59bd71b12b':
  Treat moving app as installing in new location.
 2014-08-26 20:40:04 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Libin.Tang@motorola.com
55c88b4049 am 11e86560: am 0753b635: IMS: modify sendDtmf interface. 
* commit '11e86560cfcbc8800d9d46492d9c9ab5a7530e27':
  IMS: modify sendDtmf interface.
 2014-08-26 20:29:44 +00:00
Adam Lesinski
48978dc9ed am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 
* commit '9067543165d9c821ec8fba544fe50adc06350710':
  Split up ComponentName in UsageEvents.Event
 2014-08-26 20:29:39 +00:00
Paul Jensen
52baba9086 am dd46fb1f: am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 
* commit 'dd46fb1f205412681eb86f1ea5535088cd55b3e3':
  Implement VpnConfig.addAllowedApplication().
 2014-08-26 20:29:33 +00:00
Jeff Sharkey
264a5f5b34 Merge "Treat moving app as installing in new location." into lmp-dev 2014-08-26 20:29:13 +00:00
Libin.Tang@motorola.com
91671e9c94 am 0753b635: IMS: modify sendDtmf interface. 
* commit '0753b6358f9c8762760451d50cd6ec6adf8939dc':
  IMS: modify sendDtmf interface.
 2014-08-26 20:21:20 +00:00
Adam Lesinski
a90a6b0060 am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 
* commit 'a707b2b89c7d5b71f77b2125539ed8415d49bbad':
  Split up ComponentName in UsageEvents.Event
 2014-08-26 20:21:15 +00:00
Paul Jensen
ef8f362052 am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 
* commit '96fff1a7c2c923400ce865762de7d7e40f406e59':
  Implement VpnConfig.addAllowedApplication().
 2014-08-26 20:19:43 +00:00
Libin.Tang@motorola.com
c47b18fb25 IMS: modify sendDtmf interface. 
Bug: 17282921
Change-Id: If96f209e91db420e089d429bb5c7a0f9882b4057
 2014-08-26 20:15:33 +00:00
Dianne Hackborn
302da59d8b am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit 'f1bb15d214bdb70e348ee7d649c1249a67434534':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:13:59 +00:00
Chris Craik
4cd7dbc90f Notify VM of native pixelref allocations 
bug:17178931
Change-Id: I0de22bb0d2ae8233d392b7e222f72391aaa12ce8
 2014-08-26 13:10:33 -07:00