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

120798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
 2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
 2014-03-20 10:54:38 -07:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
 2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
 2014-03-20 10:47:34 -07:00
Colin Cross
71a3d40d20 am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 17:46:50 +00:00
Colin Cross
e4360c8e14 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit '4308a5230e2887c1ee12e7bdc60e0b93212637ab':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 10:33:20 -07:00
Colin Cross
4308a5230e Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 2014-03-20 17:28:12 +00:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
 2014-03-20 10:27:58 -07:00
Craig Mautner
97024321fc Move task to top in window manager. 
In certain situations it was possible for a task to move to the top
in activity manager but not in window manager. This resulted in
the task appearing behind the launcher icons.

Fixes bug 13410184.

Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
 2014-03-20 10:08:04 -07:00
Adam Koch
065b8fd1c3 am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '8bc12a514918deb5cee9832d9d129c8ed3f7fb4b':
  Point bitmaps training class to new samples directory.
 2014-03-20 17:05:26 +00:00
Scott Main
d4d42af5c5 am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'df00735c6791811534d3d2e2790a0dcf7daffcf1':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 17:05:23 +00:00
Wei Wang
331ef6127c am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '32779536bcd66d45019f4ab80dd0d844e618e16b':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 17:05:20 +00:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev 
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
 2014-03-20 10:04:23 -07:00
Adam Koch
8bc12a5149 am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
  Point bitmaps training class to new samples directory.
 2014-03-20 16:59:23 +00:00
Scott Main
df00735c67 am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'e02d5a20ede8a6ac46e7b60cc0b258d42e224087':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 16:59:19 +00:00
Wei Wang
32779536bc am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '13bd85772f6279d14303ec3a18615613c3722844':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 16:59:13 +00:00
Marco Nelissen
a3337bc7c3 Merge "Verify certificates" into jb-dev 2014-03-20 16:58:37 +00:00
Adam Powell
f503a2d47f Update contextual asset bar assets to avoid 9-patch artifacts 
Asset drop from UX

Bug 11879853

Change-Id: I8190340900a16ae41135ec1231e36e959603e165
 2014-03-20 09:32:11 -07:00
Wei Wang
6c9385b13c am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'd10bc171a5abb8ddecd8a4888fa8833986f8d8ee':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 16:24:09 +00:00
Jim Miller
8c5567ee9e am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit 'bd33dc01f68ae0f4e4861568c02619e38c40af15':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 16:24:03 +00:00
Jim Miller
e397d90fbd am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit 'e0683de51e56d7a95c88c5c744f45c72a54a95bc':
  Fix the build.  DO NOT MERGE
 2014-03-20 16:24:01 +00:00
Michael Wright
11e0ead811 am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev 
* commit '69e58e446bc2a030ae423d650e60dbfe317331e6':
  Add idc config option for handling key repeats
 2014-03-20 16:23:50 +00:00
Chris Craik
4eefde23de am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 
* commit '29f00c9f35d8565bb3e6b8a2526cbb237db6446a':
  Fix projection offset caching - DO NOT MERGE
 2014-03-20 15:47:34 +00:00
Jim Miller
aebe3b6ca4 am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 
* commit 'abde0aaa7958976b8f3a66e348d6a5152b0d838e':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 15:47:31 +00:00
Victoria Lease
1e0ae4fa4b am ca58036d: am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'ca58036dd8018bec81fc5ab9d0376cd35b363125':
  malloc some advances
 2014-03-20 15:46:18 +00:00
Narayan Kamath
76ae4b804e am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
  Don't register methods when there's nothing to register.
 2014-03-20 10:18:51 +00:00
Narayan Kamath
c850102d5c am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit '0da4ad425d52d1aeec16b31b784c456753532dc2':
  Don't register methods when there's nothing to register.
 2014-03-20 03:13:27 -07:00
Narayan Kamath
0da4ad425d Merge "Don't register methods when there's nothing to register." 2014-03-20 10:08:38 +00:00
Adam Koch
5a510a2c3e am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '6398a86f1b6ce84effc1417b8b99216e3093af48':
  Point bitmaps training class to new samples directory.
 2014-03-20 09:31:00 +00:00
Scott Main
e02d5a20ed am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'a32c43761e5a101efbbb9183f4421ba40f4c75fb':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 09:30:51 +00:00
Jinsuk Kim
4f512fb451 Add HDMI-CEC service 
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
 2014-03-20 16:40:22 +09:00
Adam Koch
6398a86f1b Merge "Point bitmaps training class to new samples directory." into klp-docs 2014-03-20 07:12:06 +00:00
Adam Koch
21e3372d39 Point bitmaps training class to new samples directory. 
Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
 2014-03-20 14:56:41 +08:00
Scott Main
a32c43761e update to wear docs. 
includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414
and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad

Change-Id: I035b8db9b266e0af16fe30b3f30846608a3b69a5
 2014-03-19 21:20:37 -07:00
Wei Wang
13bd85772f am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 03:41:47 +00:00
Wei Wang
d10bc171a5 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit '15a18d07acc57d465e9d67bb28010912bb9ad15f':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 03:36:45 +00:00
Wei Wang
15a18d07ac am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 03:32:17 +00:00
Wei Wang
c0384b6b18 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 
Cherrypick from master to fix b/13289050

Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-19 20:31:36 -07:00
Wei Wang
da084104eb Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 2014-03-20 03:27:47 +00:00
Jim Miller
bd33dc01f6 am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit '8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 02:47:09 +00:00
Jim Miller
e0683de51e am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
 2014-03-20 02:47:04 +00:00
Minoru Aoi
2b74a24a52 Set ScreenshotSurface secure if any secure content is shown. 
The screenrecord command can record secure content during rotation.
This is because the ScreenshotSurface surface for rotation animation
is not set secure even though its screenshot contains secure content.

Change-Id: I5a70be71ddfc26de4230e7d4fe547210c2154210
 2014-03-20 11:35:33 +09:00
Chris Craik
9208bb4a2b am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:30:15 +00:00
Jim Miller
8e69abf8c6 am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit '46e631178e3420fee182e7d9d1ddfdbca9355bc1':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 02:30:14 +00:00
Chris Craik
00efaea980 am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit 'dac298005ce3c1361e27bb740e4b518765d43d77':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-19 19:24:53 -07:00
Jim Miller
46e631178e DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().

It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.

The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.

Fixes bug 11982048

Change-Id: I6959816b819ba953512c53675162195cbf1e0653
 2014-03-20 02:22:38 +00:00
Chris Craik
dac298005c Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 2014-03-20 02:19:54 +00:00
Michael Wright
69e58e446b Merge "Add idc config option for handling key repeats" into klp-modular-dev 2014-03-20 01:55:16 +00:00
Nick Kralevich
0b4f63c319 am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
  Get rid of noise during boot.
 2014-03-20 01:52:42 +00:00
Jim Miller
3705012436 am a413a4ae: Fix the build. DO NOT MERGE 
* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
  Fix the build.  DO NOT MERGE
 2014-03-20 01:49:31 +00:00