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

150610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Dianne Hackborn
7f38b19e91 am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit '55953caaa3bb1e828fae285485720a09430fcd33':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:03:51 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Michael Wright
c02c511220 am 1d622f50: Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev 
* commit '1d622f508bbc10332b402359d0451dc80ed5d3a2':
  Add missing attr for KEYCODE_VOICE_ASSIST
 2014-08-26 19:50:19 +00:00
Adam Lesinski
fe3ec1bcb3 am ef3e6d97: Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 
* commit 'ef3e6d97f95e287ff407c36b813825210fabb60a':
  Add indexOf method to ArrayMap & ArraySet
 2014-08-26 19:50:05 +00:00
Michael Wright
15741d0e0b Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev 2014-08-26 19:42:40 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event 
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
 2014-08-26 12:41:31 -07:00
Adam Lesinski
27046c88bf Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 2014-08-26 19:38:04 +00:00
Ji-Hwan Lee
ef55d9335d am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '593d311772c63c38a07553f936865d3ad154380e':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:27:34 +00:00
Calin Juravle
8f020c791c am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev 
* commit '0bc3cd8709d45858c0f21beff45a69fb89f3f4af':
  Make native bridge property read-only.
 2014-08-26 19:27:29 +00:00
Calin Juravle
e9cc91085d am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 
* commit '2fb4f93efa5a7365def2dc9b19e68dbe04ed28d1':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-26 19:21:28 +00:00
Selim Gurun
389e887027 am 961aaadf: Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 
* commit '961aaadf532c81ee95a5e21a8e905cc91965eff9':
  Remove synchronized from acceptThirdPartyCookies()
 2014-08-26 19:21:18 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Calin Juravle
4db289eb54 Merge "Make native bridge property read-only." into lmp-dev 2014-08-26 19:18:24 +00:00
Amith Yamasani
200f20bed5 am a245f91c: Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 
* commit 'a245f91caed3dc2c073f152f0e371d8b27c43184':
  Fix SetupWizard crash when creating Guest or Restricted profile
 2014-08-26 19:11:34 +00:00
Svetoslav
2c9def2a0a am 0fbd3928: Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 
* commit '0fbd392870485d848bf69ef4431f882d63ead728':
  Fix accessiblity CTS tests (framework).
 2014-08-26 19:11:29 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Selim Gurun
790f6f449d Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 2014-08-26 19:09:48 +00:00
Calin Juravle
685a12b446 Make native bridge property read-only. 
Bug: 17104449

(cherry picked from commit 53db6ae7819177abb9df156b269726a69a8c72df)

Change-Id: I926356f1e472a20d571e40c0c7dbb9c5a66a44a9
 2014-08-26 20:07:51 +01:00
Jorim Jaggi
3fa0064ba4 am 4d323406: Merge "Update IME switcher icon" into lmp-dev 
* commit '4d3234069a794e2d7c63510f0b74b477aa51c24d':
  Update IME switcher icon
 2014-08-26 19:05:55 +00:00
Amith Yamasani
1771d39ebf Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 2014-08-26 19:02:18 +00:00
Svetoslav
e39baa7307 Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 2014-08-26 19:01:50 +00:00
Baligh Uddin
2d1d387d3f Import translations. DO NOT MERGE 
Change-Id: Iac6630d0b618bc97f0bb62047cee97a797c52df7
Auto-generated-cl: translation import
 2014-08-26 11:57:30 -07:00
Adam Lesinski
4e9c07c0de Add indexOf method to ArrayMap & ArraySet 
Getting the indexOf is useful for doing compound operations
like:

int i = set.indexOf(key);
if (i >= 0) {
    Object o = set.valueAt(i);
    o.blah();
    set.removeAt(i);
}

Change-Id: I3d4b77d1461ba969fc6b4d332d52d4d084b5b53c
 2014-08-26 11:53:32 -07:00
Jorim Jaggi
6183cc1a68 Merge "Update IME switcher icon" into lmp-dev 2014-08-26 18:51:08 +00:00
Andrew Solovay
3442b412e1 am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit '8d8cf0b22f9f8eaf06914697fbe22a77cb27e307':
  docs: Fixed error in code sample.
 2014-08-26 18:47:25 +00:00
Diego Pontoriero
a2f95d814d am 1b3c0f25: Merge "Remove unused constant from TelephonyIntents." into lmp-dev 
* commit '1b3c0f25bef103e9b5cefccb49e3b1a121fdedc6':
  Remove unused constant from TelephonyIntents.
 2014-08-26 18:47:10 +00:00
Jorim Jaggi
31fc3e8047 Update IME switcher icon 
Also make the transparency consistent with the other icons.

Bug: 15597889
Change-Id: Ia5c8ea0bed192b57c552c62358b365d979c4b062
 2014-08-26 20:42:38 +02:00
Diego Pontoriero
c9256d3da1 Merge "Remove unused constant from TelephonyIntents." into lmp-dev 2014-08-26 18:36:41 +00:00
Andrew Solovay
8d8cf0b22f am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit 'e7c7993e4d490b67b329ef2502e35c8aad763ca1':
  docs: Fixed error in code sample.
 2014-08-26 18:36:23 +00:00
Adam Lesinski
4526cdec74 am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 
* commit '521edf850799fd484ef2c363aed23ac8729240be':
  Have R classes generate their own reference rewrite logic
 2014-08-26 18:29:46 +00:00
Winson Chung
6a327bedfc am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 
* commit '319b4b571c71a6943ff3a63154c873511ae01d87':
  Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
 2014-08-26 18:29:41 +00:00
Andrew Solovay
e7c7993e4d Merge "docs: Fixed error in code sample." into klp-modular-docs 2014-08-26 18:25:33 +00:00