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

101219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
7ca095f095 am 32440aa2: Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev 
* commit '32440aa25d958c8b82e7c17f784defc0a5860c0a':
  Unify inputDispatchingTimedOut with keyDispatchingTimedOut
 2013-03-01 22:25:50 +00:00
Michael Wright
32440aa25d Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev 2013-03-01 22:20:46 +00:00
Michael Wright
7dd5bb18d4 Unify inputDispatchingTimedOut with keyDispatchingTimedOut 
Bug: 8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
 2013-03-01 14:14:35 -08:00
Selim Gurun
77a29b35c3 am 7be6d4c4: Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 
* commit '7be6d4c421cfa6f93079517d3ee54024c8049ae5':
  Clarify the API documentation for WebSQL database.
 2013-03-01 21:53:18 +00:00
Selim Gurun
7be6d4c421 Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 2013-03-01 21:46:42 +00:00
Selim Gurun
2bca22b2a5 Clarify the API documentation for WebSQL database. 
Bug: 8231270

WebSQL database is disabled by default. And setting change to
enable it must precede the first url navigation. This change
is to clarify this behavior.

Change-Id: Ic0aab764821daece83f3482b30df4bebc7ff1f37
 2013-03-01 13:35:12 -08:00
Jonathan Dixon
9ee59e5375 am 10010128: Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 
* commit '10010128088bdbc7b03d38ff594428f8a0d52714':
  Remove obsolete target-densitydpi documentation
 2013-03-01 21:12:38 +00:00
Jonathan Dixon
1001012808 Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 2013-03-01 21:09:06 +00:00
Dmitry Shmidt
076d90298a am a7f9b4e9: Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev 
* commit 'a7f9b4e909b359ae94e88ebc402156f88931088b':
  wifi: Add checking for scan results EOB
 2013-03-01 20:49:15 +00:00
Dmitry Shmidt
a7f9b4e909 Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev 2013-03-01 20:12:53 +00:00
Chris Craik
95d6cbfcc6 am 1da8a6a3: Merge "Add shader program selection shortcut" into jb-mr2-dev 
* commit '1da8a6a36df0389dd4c213a8f9698874c484c839':
  Add shader program selection shortcut
 2013-03-01 19:47:35 +00:00
Chris Craik
1da8a6a36d Merge "Add shader program selection shortcut" into jb-mr2-dev 2013-03-01 19:42:38 +00:00
Scott Main
94e1dcf463 am 624de685: am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '624de6854f42feb9d2761db857c6f36a47fabb25':
  docs: add bdc's security doc as training article
 2013-03-01 19:18:09 +00:00
Scott Main
624de6854f am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '44e087bdba93817f2031e20b0c189c548e1fef5d':
  docs: add bdc's security doc as training article
 2013-03-01 19:13:37 +00:00
Scott Main
44e087bdba am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
  docs: add bdc's security doc as training article
 2013-03-01 11:11:52 -08:00
Chris Craik
096b8d96d5 Add shader program selection shortcut 
Add a key manipulation that makes black text/paths use the standard
simple bitmap/patch shader, since they are the same. Previously we'd
create a separate shader for each because the keys differed, even
though the shaders were functionally equivalent.

Also fixes some issues around setting DEBUG_PROGRAM

Change-Id: I0c77c684d58da03501ee9ab8239c7d4a70fd6b5c
 2013-03-01 11:11:31 -08:00
Scott Main
a3279494a4 am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '8d5b88463b37cc254ed8333506fc47bb1ec193bb':
  docs: add bdc's security doc as training article
 2013-03-01 11:09:14 -08:00
Scott Main
8d5b88463b am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit '16bdd13ec7e64c04e1a17b94ffcb2a08f3b47518':
  docs: add bdc's security doc as training article
 2013-03-01 11:06:49 -08:00
Scott Main
16bdd13ec7 am 00158363: docs: add bdc\'s security doc as training article 
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
 2013-03-01 11:04:27 -08:00
Baligh Uddin
63f4eadd5d am b237b9e0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'b237b9e081d612e9e32308474d8fa028764524fe':
  Import translations. DO NOT MERGE
 2013-03-01 18:26:46 +00:00
Baligh Uddin
fb10350bc9 Merge "Import translations. DO NOT MERGE" 2013-03-01 18:22:36 +00:00
Baligh Uddin
b237b9e081 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-01 18:20:24 +00:00
Nick Kralevich
03845a5973 am 2ce5173a: Merge commit \'199f9655\' into manualmerge 
* commit '2ce5173afbb4536f3bf2e6ebcfb86e3a7fd14bf2':
  installd: use correct header file.
 2013-03-01 18:08:42 +00:00
Nick Kralevich
2ce5173afb Merge commit '199f9655' into manualmerge 
these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev
 2013-03-01 10:01:29 -08:00
Dmitry Shmidt
bca462a2dc wifi: Add checking for scan results EOB 
Change-Id: I969079b72fdffe1b84d88242caa6b6281d1f02b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-03-01 09:57:58 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article 
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
 2013-03-01 09:49:41 -08:00
Nick Kralevich
a9ee4d2a9f am e6067579: am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files." 
* commit 'e606757966175e6f287e18ed2e458050f7da3731':
  ZygoteInit: use correct header files.
 2013-03-01 17:46:19 +00:00
Dmitry Shmidt
5dbde7af9f am 14b628a3: wifi: Add delimiter flag into bss scan results request 
* commit '14b628a3400b6c36e0604f403dd72553c6fe63c2':
  wifi: Add delimiter flag into bss scan results request
 2013-03-01 17:42:48 +00:00
Nick Kralevich
e606757966 am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files." 
* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81':
  ZygoteInit: use correct header files.
 2013-03-01 17:41:53 +00:00
Nick Kralevich
199f965552 am f5276c16: Merge "installd: use correct header file." 
* commit 'f5276c16ad97d94f8773938012ae54f8c7ba450a':
  installd: use correct header file.
 2013-03-01 09:39:45 -08:00
Nick Kralevich
edb95c3f3c am 937cfa77: Merge "ZygoteInit: use correct header files." 
* commit '937cfa77c464f7dc13f686dc8f9f4667a17e80d6':
  ZygoteInit: use correct header files.
 2013-03-01 09:39:42 -08:00
Dmitry Shmidt
14b628a340 wifi: Add delimiter flag into bss scan results request 
Change-Id: I2989ef1ee884db6add0405f36b628701aa928f69
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-03-01 09:37:00 -08:00
Bjorn Bringert
8d628f0c69 am bc086862: Declare VOICE_ASSIST intent 
* commit 'bc086862e216bbe8ffc2dfb68f09a872505d9d48':
  Declare VOICE_ASSIST intent
 2013-03-01 17:21:32 +00:00
Baligh Uddin
a6d6564187 Import translations. DO NOT MERGE 
Change-Id: I974b6c56bec344f2d4350e34b5e38ace9aaa2f31
Auto-generated-cl: translation import
 2013-03-01 09:03:55 -08:00
Baligh Uddin
7c36114d7f Import translations. DO NOT MERGE 
Change-Id: I66270509422beeed4de4d5c7e94c62be82365a44
Auto-generated-cl: translation import
 2013-03-01 08:55:13 -08:00
Nick Kralevich
f5276c16ad Merge "installd: use correct header file." 2013-03-01 16:40:14 +00:00
Nick Kralevich
937cfa77c4 Merge "ZygoteInit: use correct header files." 2013-03-01 16:39:37 +00:00
Bjorn Bringert
bc086862e2 Declare VOICE_ASSIST intent 
Bug: 8289964
Change-Id: I241b5166a98a7a462691f0169bf1b6f4fe7b2e0f
 2013-03-01 12:59:24 +00:00
Romain Guy
57b7725e9b am 84ea20d0: Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev 
* commit '84ea20d0ba7611782c7aa364cd41744fca359e35':
  Restore the ability to track native Surface changes Bug #8230990
 2013-03-01 02:40:13 +00:00
Satoshi Kataoka
24364451c3 Merge "Add a comment for secondary user handling in IMMS" 2013-03-01 02:34:11 +00:00
Romain Guy
84ea20d0ba Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev 2013-03-01 02:33:50 +00:00
Romain Guy
8b5aa48469 Restore the ability to track native Surface changes 
Bug #8230990

ViewRootImpl needs to know when the native Surface objects changes
to recreate the EGL surface. A recent refactoring in Surface broke
the behavior of getGenerationId(). This simply restores the old
behavior (every change increments the generation ID by 1.)

Change-Id: Ife1df1ffb2ee7a373b8ebf2431192702ba10f344
 2013-02-28 18:16:31 -08:00
Jim Miller
83178a6791 Merge "Post-review Keyguard cleanup." 2013-03-01 02:07:27 +00:00
Svetoslav
6b25e726cb Remove a workaround for accessibility managers that works across users. 
The system and some processes such as the keyguard and system UI
run across users. Hence, the local accessibility manager should call
into the backing system service with the id of the current user.
For all other processes the local manager uses the current user id.
There was a method that is to be called before the local accessibility
manager has been accessed to initialize it to work across users.
This had to be done for keyguard and system UI.

This change removed the workaround and now the local accessibility
manager determines under the hood which user id to use while calling
into the system. If the local manager is in the system process or
its process has permissions to work across uses, the manager uses
UserHandle.USER_CURRENT, otherwise it uses the user if its process.

Change-Id: I3e97fe98805adca01c1a0127a276828e90926f95
 2013-02-28 17:57:29 -08:00
Jim Miller
25190577cc Post-review Keyguard cleanup. 
- remove userActivity() from KeyguardService interface and call it
on PowerManager directly
- Split IKeyguardResult into two parts: IKeyguardShowCallback and
IKeyguardExitCallback.
- Misc other changes from the review.

Change-Id: I3f679cfa5d3f8bc742f2b2259ac354045e89a87b
 2013-02-28 17:41:34 -08:00
Chris Craik
32e18d9f32 am cccd6c67: Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev 
* commit 'cccd6c67db8c610bcaa469e0e1b808eb98807453':
  Avoid trying to draw invisible ShapeDrawables
 2013-03-01 01:22:37 +00:00
Chris Craik
cccd6c67db Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev 2013-03-01 01:16:44 +00:00
Chris Craik
f0e0678460 Avoid trying to draw invisible ShapeDrawables 
This avoids work when a drawable is declared with @android:color/transparent

Change-Id: I1b6d3b22751e378be047a5538dfd4d4baab3c03a
 2013-02-28 17:05:12 -08:00
Jeff Sharkey
6d248625d3 am 7f61d014: Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev 
* commit '7f61d0146e48275bf372e6b1ea82d2f48163c73d':
  Allow loopback traffic in lockdown mode.
 2013-03-01 01:03:27 +00:00
Jeff Sharkey
7f61d0146e Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev 2013-03-01 00:58:32 +00:00