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

153523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
d826b80770 Import translations. DO NOT MERGE 
Change-Id: I98bdfdd87bee6fd3794cf336d96cbf8a05a8906e
Auto-generated-cl: translation import
 2014-08-26 14:20:59 -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
vandwalle
0f5734dda8 am 362448d4: am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev 
* commit '362448d4b91704503340e9f751d26b88706c2057':
  add radio stats to link layer
 2014-08-26 21:13:03 +00:00
Baligh Uddin
6ebb6b17df Merge "Import translations. DO NOT MERGE" 2014-08-26 21:08:02 +00:00
Baligh Uddin
dee02bad5a Merge "Import translations. DO NOT MERGE" 2014-08-26 21:07:55 +00:00
Baligh Uddin
2d00999cf3 Merge "Import translations. DO NOT MERGE" 2014-08-26 21:07:41 +00:00
Baligh Uddin
a93a740509 Merge "Import translations. DO NOT MERGE" 2014-08-26 21:07:41 +00:00
Baligh Uddin
553aac1866 Merge "Import translations. DO NOT MERGE" 2014-08-26 21:07:37 +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
4db2fc2d10 Import translations. DO NOT MERGE 
Change-Id: I5f6a84a6344633a8fabb8e66b4f5d337fad054e1
Auto-generated-cl: translation import
 2014-08-26 14:04:16 -07: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
Jae Seo
d824acc263 am aef26a7a: am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit 'aef26a7a3116649801600b6aca80039b200aa4c2':
  TIF: Make TV content rating names consistent
 2014-08-26 21:02:57 +00:00
Jeff Sharkey
fe6754f944 am be8c6d58: am f3f849d1: am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit 'be8c6d5803093578f6710778436c0233469b6536':
  Treat moving app as installing in new location.
 2014-08-26 21:02:47 +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
Baligh Uddin
609476ac27 Import translations. DO NOT MERGE 
Change-Id: I8d2977f908e4f188e41bde88fa15dfaf177d5569
Auto-generated-cl: translation import
 2014-08-26 14:00:18 -07:00
Baligh Uddin
86edbce4a8 Import translations. DO NOT MERGE 
Change-Id: Ie19ebc8a59550cf3cb1f109561df7a02ebf13738
Auto-generated-cl: translation import
 2014-08-26 13:56:57 -07:00
Sungsoo Lim
9dd43afbb9 Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS 
Bug: 16948874
Change-Id: If44aaa7085705e8a2f55c71dae61bf6ac0cdfc09
 2014-08-26 13:56:42 -07: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
Libin.Tang@motorola.com
842735e791 am aa622932: am 11e86560: am 0753b635: IMS: modify sendDtmf interface. 
* commit 'aa62293246edc381644ba6de2e7b0dbb83bcf664':
  IMS: modify sendDtmf interface.
 2014-08-26 20:39:46 +00:00
Adam Lesinski
d3eb9151b4 am 2626a16b: am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 
* commit '2626a16b53267832f13a8c222f7b65514f24ae9d':
  Split up ComponentName in UsageEvents.Event
 2014-08-26 20:39:41 +00:00
Paul Jensen
a53583ce84 am bb28fa02: am dd46fb1f: am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 
* commit 'bb28fa02b1c6c188c00957ca0ddd0451db651071':
  Implement VpnConfig.addAllowedApplication().
 2014-08-26 20:39:36 +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
Dianne Hackborn
e9c13a60c0 am 11bba84c: am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit '11bba84c2da1c30e0d3b67456c04995d16a5db52':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:23:49 +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
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Paul Jensen
5b62d263a7 Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 2014-08-26 20:09:00 +00:00