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

120146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ee800b04d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-31 22:11:33 +00:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Craig Stout
ecaea7e60c Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 2014-03-31 19:02:25 +00:00
Baligh Uddin
23f64109d0 Import translations. DO NOT MERGE 
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
 2014-03-31 11:37:11 -07:00
Baligh Uddin
dc5e02bdcc Import translations. DO NOT MERGE 
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
 2014-03-31 11:34:59 -07:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:56:00 +00:00
Adam Hampson
594c73fc57 Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 2014-03-28 22:22:52 +00:00
Aaron Whyte
f10d0399bf Made secure-adb's new-public-key activity configurable. 
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.

Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
 2014-03-28 22:21:55 +00:00
Michael Wright
d08c864784 Add InputDevice#supportsSource(int). 
This mirrors the InputEvent#isFromSource API.

Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
 2014-03-28 12:59:34 -07:00
John Spurlock
5579ec33eb DO NOT MERGE Enhance the NotificationListenerService api. 
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
 2014-03-28 10:19:00 -04:00
Wei Wang
9d3e099699 Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev 2014-03-28 04:04:47 +00:00
Scott Main
d27f82f92a am a3a4d466: am 83d6ae28: fix broken links 
* commit 'a3a4d46609ebb1470d24c7d77662a8b16440765c':
  fix broken links
 2014-03-28 03:23:18 +00:00
Scott Main
a3a4d46609 am 83d6ae28: fix broken links 
* commit '83d6ae2804e280bd1e0980faf4e3090d240eb5f5':
  fix broken links
 2014-03-28 03:15:10 +00:00
Scott Main
83d6ae2804 fix broken links 
Change-Id: I5964804c219ef02cd5f380bf752061ff7a022d61
 2014-03-27 20:07:48 -07:00
Wei Wang
f3f52b1b4c Add comment of using same callback for start/stop advertising. 
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
 2014-03-27 19:34:46 -07:00
Jeff Sharkey
2d8f330fe7 am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit 'a686d16d5924d2afe06586110e7dca33ecad535c':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:49:21 +00:00
Brian Carlstrom
bd877cb67f am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit '69511ada3cc833f341bd7df006de0f8c44848eb8':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:45:14 +00:00
Jeff Sharkey
a686d16d59 am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '0bc7cea6aa2523f9f519f63038c541cb1b1942a8':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:43:53 +00:00
Jeff Sharkey
0bc7cea6aa Enlarge space allowed for internal downloads. 
Bug: 13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
 2014-03-27 18:16:32 -07:00
Brian Carlstrom
69511ada3c am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'b244097b48398514c88c21506567fe400fb41f9e':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:13:04 +00:00
Brian Carlstrom
b244097b48 am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'cc4d10d0f1f349ad13dcd67fc19718bf31932840':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:08:43 +00:00
Brian Carlstrom
cc4d10d0f1 am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'cec0280a1d935cf31f6b2b480af0f463e2d8c91a':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:01:40 +00:00
Baligh Uddin
0b7f300a55 am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
  Import translations. DO NOT MERGE
 2014-03-27 23:05:01 +00:00
Selim Cinek
58e99f564d am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit 'b6e077dcbe1034007fd52b48951637a9be4bab74':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 23:04:57 +00:00
Brian Carlstrom
cec0280a1d am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'bea6517da91e9af08feb8c305ec9d9a4576dc6ad':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-27 22:29:08 +00:00
Craig Stout
5ed67222fe Force refresh of stateful when a child drawable is changed. 
Change-Id: Ie17d4c8bceae385e597f3006fcd456be9ef53b97
 2014-03-27 15:19:44 -07:00
Baligh Uddin
852750b321 am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '537ea90e554946ccb05af321e19df3a3fb377d2a':
  Import translations. DO NOT MERGE
 2014-03-27 22:15:45 +00:00
Selim Cinek
b6e077dcbe am 7718fc12: Fixed crash when setting wallpaper with built in rotation 
* commit '7718fc1291c73576417f0c25d88f5105f7ae7365':
  Fixed crash when setting wallpaper with built in rotation
 2014-03-27 22:15:37 +00:00
Brian Carlstrom
bea6517da9 am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'e0b94d1cf16c11406554edd035c7e1bef6d2b844':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-27 22:15:24 +00:00
Brian Carlstrom
e0b94d1cf1 Revert "Remove doSingleCrunch call DO NOT MERGE" 
This reverts commit 3944abbb506bb94d8e70b8b62f30225777f50648.
 2014-03-27 14:50:06 -07:00
Baligh Uddin
537ea90e55 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-27 21:43:41 +00:00
Baligh Uddin
de11c26060 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-27 21:43:39 +00:00
Adam Hampson
25b32c65e7 hdmi: cec: add permission name to dump permission denial message 
The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.

Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
 2014-03-27 14:20:23 -07:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
d3849f5415 Check return values for null. 
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
 2014-03-27 13:19:29 -07:00
Scott Main
7b190e0f1d am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d':
  update viewport variable with new underscore format
 2014-03-27 20:13:59 +00:00
Scott Main
22b483ee6e am bbaf11f4: update viewport variable with new underscore format 
* commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830':
  update viewport variable with new underscore format
 2014-03-27 20:08:17 +00:00
Scott Main
bbaf11f421 update viewport variable with new underscore format 
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
 2014-03-27 13:01:56 -07:00
Selim Cinek
7718fc1291 Fixed crash when setting wallpaper with built in rotation 
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees

Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
 2014-03-27 19:34:01 +00:00
Scott Main
4243710bf8 am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
  fix bug in code snippet
 2014-03-27 19:08:23 +00:00
Scott Main
89f4a5463b am 0c933df6: fix bug in code snippet 
* commit '0c933df6d09dfb3923e0891028c67249bc8887d5':
  fix bug in code snippet
 2014-03-27 19:02:33 +00:00
Scott Main
0c933df6d0 fix bug in code snippet 
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
 2014-03-27 11:53:38 -07:00
Adam Lesinski
fc680b8918 Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev 2014-03-27 17:11:35 +00:00
Scott Main
b5e754dd4d am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit '8ea583a71aef2f21f833c003a948ca7b1dc32915':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:24:46 +00:00
Scott Main
8ea583a71a am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit 'f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:15:18 +00:00