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

112852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
1775ebb76f am b6459eb2: am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 
* commit 'b6459eb25f0593561389d7cb3da38a4f960cce14':
  Implement issue #10550827: watching gpu memory for occam_svelte
 2013-09-06 15:34:43 -07:00
Dianne Hackborn
b6459eb25f am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 
* commit '3e1fdd9ed02f95fd2dfefc36b34754f2ede1a2af':
  Implement issue #10550827: watching gpu memory for occam_svelte
 2013-09-06 15:28:23 -07:00
Dianne Hackborn
3e1fdd9ed0 Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 2013-09-06 22:25:56 +00:00
Timothy Knight
772aeccb19 am 11c9168c: am b39b46bf: Merge "Camera2: Minor docs fix." into klp-dev 
* commit '11c9168c09b6796e47d0e342b0995f73d4e5a0e2':
  Camera2: Minor docs fix.
 2013-09-06 15:17:53 -07:00
Timothy Knight
11c9168c09 am b39b46bf: Merge "Camera2: Minor docs fix." into klp-dev 
* commit 'b39b46bf87bc16818e88c2773acff398fb80b836':
  Camera2: Minor docs fix.
 2013-09-06 15:15:02 -07:00
Dmitry Shmidt
d7363f434f am 4f54abfc: am 00cd7132: Merge "wifi: Fix cleaning scan result cache" into klp-dev 
* commit '4f54abfc73fdf71ca7f7866106a98d73822fc893':
  wifi: Fix cleaning scan result cache
 2013-09-06 15:14:22 -07:00
Timothy Knight
b39b46bf87 Merge "Camera2: Minor docs fix." into klp-dev 2013-09-06 22:11:38 +00:00
Dmitry Shmidt
4f54abfc73 am 00cd7132: Merge "wifi: Fix cleaning scan result cache" into klp-dev 
* commit '00cd7132b87953a999e804181b665a6245a82c17':
  wifi: Fix cleaning scan result cache
 2013-09-06 15:11:28 -07:00
Sandeep Siddhartha
3a67da9781 am 994bf3a1: am 22ae5d6d: Merge "Use the permission for hotword recognition" into klp-dev 
* commit '994bf3a1119855059b40b0adc45c17c13bc4c512':
  Use the permission for hotword recognition
 2013-09-06 15:09:40 -07:00
Sandeep Siddhartha
bc7d392ef1 am c3360d2a: am b05b4086: Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 
* commit 'c3360d2a8b6d7b8e820c99844364be4f1fc83824':
  Add permission checks and unhide the Hotword recognition APIs
 2013-09-06 15:09:36 -07:00
Dmitry Shmidt
00cd7132b8 Merge "wifi: Fix cleaning scan result cache" into klp-dev 2013-09-06 22:09:27 +00:00
Sandeep Siddhartha
994bf3a111 am 22ae5d6d: Merge "Use the permission for hotword recognition" into klp-dev 
* commit '22ae5d6de11b0a6126987293b44cd85048a45015':
  Use the permission for hotword recognition
 2013-09-06 15:06:49 -07:00
Sandeep Siddhartha
c3360d2a8b am b05b4086: Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 
* commit 'b05b408614767fb60295830d6bf557b33252498e':
  Add permission checks and unhide the Hotword recognition APIs
 2013-09-06 15:06:47 -07:00
Dianne Hackborn
37c9943262 Implement issue #10550827: watching gpu memory for occam_svelte 
Well, it would work if the published file permissions gave the
system process access to them. :(

Change-Id: I99e0c506f52c212384b20a042dcdd35516cf49c2
 2013-09-06 15:06:04 -07:00
Sandeep Siddhartha
22ae5d6de1 Merge "Use the permission for hotword recognition" into klp-dev 2013-09-06 22:04:44 +00:00
Sandeep Siddhartha
b05b408614 Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 2013-09-06 22:04:26 +00:00
Mike Lockwood
a038dd4356 am a8c0e363: am c8fb093a: Merge "Allow L2CAP sockets" into klp-dev 
* commit 'a8c0e3639b69efcf4232d0bba808cebeefc60789':
  Allow L2CAP sockets
 2013-09-06 14:56:30 -07:00
Mike Lockwood
a8c0e3639b am c8fb093a: Merge "Allow L2CAP sockets" into klp-dev 
* commit 'c8fb093a8970b78084f2b4505fc283ac9e24317b':
  Allow L2CAP sockets
 2013-09-06 14:53:53 -07:00
Mike Lockwood
c8fb093a89 Merge "Allow L2CAP sockets" into klp-dev 2013-09-06 21:50:05 +00:00
Dianne Hackborn
1d0d403bc5 am ce277b51: am 298cbe9c: Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 
* commit 'ce277b51475a53970f6cd2ff8456883884381cef':
  Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed...
 2013-09-06 14:38:21 -07:00
Dianne Hackborn
ce277b5147 am 298cbe9c: Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 
* commit '298cbe9c403f9c6c66cecf601cccfcfd82e50930':
  Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed...
 2013-09-06 14:35:43 -07:00
Dianne Hackborn
298cbe9c40 Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 2013-09-06 21:31:29 +00:00
Dmitry Shmidt
8e7c1b1222 wifi: Fix cleaning scan result cache 
Bug: 10198923

Change-Id: I18dfc10860b8fb623751c62a4bc54b628246cf0c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-09-06 14:25:14 -07:00
Jeff Sharkey
c022ee7ace am c91be711: am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev 
* commit 'c91be7119e817f76f175da46ac26468fcb29b632':
  Another asset drop, provider icons, tests.
 2013-09-06 14:03:06 -07:00
Dianne Hackborn
1d0b177754 Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed... 
...correctly with overloaded resources

Change this attribute and a few other manifest attributes to allow
them to change based on platform SDK version.

Clean up a little more the whole mess with native vs. java config
bit masks.

Change-Id: Ia0baa3f7aed00bcb432701bcf99a9112124d6519
 2013-09-06 14:02:54 -07:00
Jeff Sharkey
c91be7119e am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev 
* commit 'e6bbcaf0bc010563c1c65f51ff4610a7bde26609':
  Another asset drop, provider icons, tests.
 2013-09-06 14:00:34 -07:00
Jeff Sharkey
e6bbcaf0bc Merge "Another asset drop, provider icons, tests." into klp-dev 2013-09-06 20:57:39 +00:00
Dianne Hackborn
81a0cb158b am c268c442: am f0ac3a6b: Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 
* commit 'c268c442a154800c0a2fd3199fa4798b3dbb284c':
  Fix issue #10650718: Camera DOA on KLP
 2013-09-06 13:51:00 -07:00
Victoria Lease
2139aa255e am dfd7e1d3: am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev 
* commit 'dfd7e1d3e9f47854baaf63a2a1a836c3a2c4b276':
  add NotoSansSymbols to fallback chain
 2013-09-06 13:46:25 -07:00
Mathias Agopian
84e6ccf790 am e669c7ac: am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev 
* commit 'e669c7aca3c02b9991d5a1cfcad40b5ae48faab2':
  tweak the electron beam animation a bit
 2013-09-06 13:46:22 -07:00
Dianne Hackborn
2949d1af93 am 5e615ee5: am a4796d51: Merge "Fix to show correct duration." into klp-dev 
* commit '5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424':
  Fix to show correct duration.
 2013-09-06 13:46:18 -07:00
Igor Murashkin
a94db2467c am 76f883e0: am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '76f883e0a8fa6d62110824399440c779a1b68874':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:46:16 -07:00
Dianne Hackborn
c268c442a1 am f0ac3a6b: Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 
* commit 'f0ac3a6b04cb23aa5b7e0c1e307e3dea7de6dcc9':
  Fix issue #10650718: Camera DOA on KLP
 2013-09-06 13:45:10 -07:00
Dianne Hackborn
f0ac3a6b04 Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev 2013-09-06 20:42:29 +00:00
Victoria Lease
dfd7e1d3e9 am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev 
* commit 'a680b17fb4906570f280d4f06c0d8840a37b709a':
  add NotoSansSymbols to fallback chain
 2013-09-06 13:38:39 -07:00
Mathias Agopian
e669c7aca3 am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev 
* commit '52a5096f7cf6ef2505e182a681b0a9705bbd44bd':
  tweak the electron beam animation a bit
 2013-09-06 13:38:35 -07:00
Dianne Hackborn
5e615ee5ad am a4796d51: Merge "Fix to show correct duration." into klp-dev 
* commit 'a4796d51f6e42300ae8586741becd5ff8612c511':
  Fix to show correct duration.
 2013-09-06 13:38:27 -07:00
Igor Murashkin
76f883e0a8 am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 
* commit '034052b352e14054d5271ea42985497f6b101b4f':
  Binder: Log exceptions originating from the binder stub for oneway calls
 2013-09-06 13:38:23 -07:00
Dianne Hackborn
d4a8b9d3c1 Fix issue #10650718: Camera DOA on KLP 
Methods not kept in sync.

Change-Id: I2621255707bbc569ac476b8fb0f7e82f68585b12
 2013-09-06 13:36:57 -07:00
Timothy Knight
a2815faad7 Camera2: Minor docs fix. 
Bug: 10639270
Change-Id: Ic5b046a8f8e1c8be83f010e05247914c61b3674b
 2013-09-06 13:34:30 -07:00
Adam Powell
0cb1a791d8 am 435f957f: am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit '435f957feef58a4d393f06f57db3975633d6b09b':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 13:32:51 -07:00
David Christie
8f7b2e5683 am 8b0c6c22: am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the 
* commit '8b0c6c22a296d50ee120148a9e6d4b586f454f23':
  Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.
 2013-09-06 13:32:49 -07:00
Chris Craik
0ff8c5f33c am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev 
* commit '9b824560726eab653a1044eecdb0bfe5ff804865':
  Dump the right matrix when logging display lists
 2013-09-06 13:32:45 -07:00
Lajos Molnar
f096f93872 am 3ec449e0: am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 
* commit '3ec449e0814dbb0baa518bc05372bbb3154c2e9f':
  MediaPlayer.MTP: fix issue when main thread had no looper
 2013-09-06 13:32:43 -07:00
Adam Powell
435f957fee am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 
* commit 'b8b017cb6879352aee015ba24e9bfd05cc094e74':
  Add a minimum timeout for double-tap in GestureDetector
 2013-09-06 12:58:24 -07:00
David Christie
8b0c6c22a2 am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp 
* commit 'ba957652bf7aa32cf09de6a5a05a3acfc8912824':
  Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.
 2013-09-06 12:58:14 -07:00
Chris Craik
9b82456072 am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev 
* commit '9b40bdf64420bf1585ccadd36d0a7d38f3c77865':
  Dump the right matrix when logging display lists
 2013-09-06 12:58:06 -07:00
Lajos Molnar
3ec449e081 am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 
* commit '14add7b3e984d07b0208c5620120556f001e25fd':
  MediaPlayer.MTP: fix issue when main thread had no looper
 2013-09-06 12:58:03 -07:00
Sandeep Siddhartha
4473f02003 Use the permission for hotword recognition 
- Also fixes an issue with PendingIntents being launched from the
  lockscreen taking a lot of time

Change-Id: I91b44328ba68b225454322b90a5b19a0d4c9a772
 2013-09-06 12:48:51 -07:00
Victoria Lease
a680b17fb4 Merge "add NotoSansSymbols to fallback chain" into klp-dev 2013-09-06 19:40:00 +00:00