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

13241 Commits

Author SHA1 Message Date
Craig Mautner
9903d8bf78 Merge "Separate stacks into Home and others." 2013-04-12 22:40:35 +00:00
Emily Bernier
d65b268fcd am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:29:35 -07:00
Emily Bernier
9b8abb5abd am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:25:58 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Robert Greenwalt
720471f0fd am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '2d28d6229f8cb5e158998de421ee0a0d1ff865fe':
  Add new route.hasGateway() api
 2013-04-12 12:11:20 -07:00
Robert Greenwalt
2d28d6229f am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
 2013-04-12 12:07:14 -07:00
Robert Greenwalt
3016244ffb Merge "Add new route.hasGateway() api" into jb-mr2-dev 2013-04-12 19:02:24 +00:00
Kenny Root
7415737326 am 12cff6f6: am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev 
* commit '12cff6f6289cb6bb06b716e75e7776099343323a':
  Remove keystore entries when app data cleared
 2013-04-12 12:00:59 -07:00
Kenny Root
12cff6f628 am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev 
* commit '10a25c0af785ee0daa735fc9a26571fb4c27399a':
  Remove keystore entries when app data cleared
 2013-04-12 11:56:53 -07:00
Robert Greenwalt
ca441ee2f0 Add new route.hasGateway() api 
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
 2013-04-12 11:22:52 -07:00
Kenny Root
6fd1c85d7f Remove keystore entries when app data cleared 
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

Bug: 8566369
Change-Id: I201c92d0893f0d18e87970dcd59ef6cd904584dc
 2013-04-12 10:09:02 -07:00
Svetoslav
3ba01a7cc3 am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 
* commit '9d02928e4349cecfa14e195d3d6f40e68c5fc468':
  Adding APIs for an accessibility service to intercept key events.
 2013-04-11 22:51:09 -07:00
Svetoslav
9d02928e43 am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 
* commit '14c8c741f79983578a8e9c5124d142c6d85ab91b':
  Adding APIs for an accessibility service to intercept key events.
 2013-04-11 22:48:39 -07:00
Svetoslav
14c8c741f7 Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 2013-04-12 05:45:43 +00:00
Geremy Condra
c797b40ade am 64ef8ed8: am 68913baf: Merge "Remove /data/system location for mac_permissions.xml." 
* commit '64ef8ed88c435108bec7f780fb9d8378422c5751':
  Remove /data/system location for mac_permissions.xml.
 2013-04-11 19:07:49 -07:00
Geremy Condra
64ef8ed88c am 68913baf: Merge "Remove /data/system location for mac_permissions.xml." 
* commit '68913baf72832226c0788bdba885e92e186cc2d8':
  Remove /data/system location for mac_permissions.xml.
 2013-04-11 19:05:10 -07:00
Dianne Hackborn
8773a5c52e am 26c702c3: am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev 
* commit '26c702c395fbbd833c2ae8d155ed4605b36c5472':
  Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...
 2013-04-11 18:36:34 -07:00
Dianne Hackborn
26c702c395 am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev 
* commit 'ba880da44c672e64f76a593ed96e514a56bc7c56':
  Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...
 2013-04-11 18:32:40 -07:00
Dianne Hackborn
7b92467179 Fix issue #7643046: Activity.getCallingPackage() bogusly returns null... 
...after having to recreate the task stack

Change-Id: Ia354240f3650ddb578f2116a2aa4584e9ffe8508
 2013-04-11 18:12:56 -07:00
Emily Bernier
b223f73a69 Add user restrictions (credentials, user removal) 
Created constants in current.txt and UserManager.java, modified restrictions access in UserManagerService.java.

Change-Id: If8d778d84af81dcbf5784f6e0afd9ef966cc8ecf
 2013-04-11 19:56:49 -04:00
Robert Greenwalt
87beab2f37 am 5ec50ebd: am b7e6a443: Merge "Routing workaround." into jb-mr2-dev 
* commit '5ec50ebd9a66895f5ac9c5c2df2a8790fe08d986':
  Routing workaround.
 2013-04-11 16:32:23 -07:00
Robert Greenwalt
5ec50ebd9a am b7e6a443: Merge "Routing workaround." into jb-mr2-dev 
* commit 'b7e6a4433bda6c59540ffc51061aff5cc3d10166':
  Routing workaround.
 2013-04-11 16:29:38 -07:00
Robert Greenwalt
b7e6a4433b Merge "Routing workaround." into jb-mr2-dev 2013-04-11 23:27:20 +00:00
Svetoslav
c4fccd183f Adding APIs for an accessibility service to intercept key events. 
Now that we have gestures which are detected by the system and
interpreted by an accessibility service, there is an inconsistent
behavior between using the gestures and the keyboard. Some devices
have both. Therefore, an accessibility service should be able to
interpret keys in addition to gestures to provide consistent user
experience. Now an accessibility service can expose shortcuts for
each gestural action.

This change adds APIs for an accessibility service to observe and
intercept at will key events before they are dispatched to the
rest of the system. The service can return true or false from its
onKeyEvent to either consume the event or to let it be delivered
to the rest of the system. However, the service will *not* be
able to inject key events or modify the observed ones.

Previous ideas of allowing the service to say it "tracks" the event
so the latter is not delivered to the system until a subsequent
event is either "handled" or "not handled" will not work. If the
service tracks a key but no other key is pressed essentially this
key is not delivered to the app and at potentially much later point
this stashed event will be delivered in maybe a completely different
context.The correct way of implementing shortcuts is a combination
of modifier keys plus some other key/key sequence. Key events already
contain information about which modifier keys are down as well as
the service can track them as well.

bug:8088812

Change-Id: I81ba9a7de9f19ca6662661f27fdc852323e38c00
 2013-04-11 16:00:08 -07:00
Robert Greenwalt
4be30faef5 am 63582a79: am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev 
* commit '63582a790e891780f391a1f8c6ee30837455421f':
  Use CONNECTIVITY_INTERNAL for global proxy
 2013-04-11 14:58:33 -07:00
Robert Greenwalt
63582a790e am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev 
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
  Use CONNECTIVITY_INTERNAL for global proxy
 2013-04-11 14:16:28 -07:00
Robert Greenwalt
ccbe7e6ff1 Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev 2013-04-11 21:11:44 +00:00
Jaikumar Ganesh
85ff1431e0 am ea4f556f: am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev 
* commit 'ea4f556f707678aa4d4be3f60b1dc34380f9f15a':
  Sensor values changes.
 2013-04-11 10:56:18 -07:00
Jaikumar Ganesh
ea4f556f70 am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev 
* commit '651f99cb5588ccd313e2e532a6b9ccf9d679ff44':
  Sensor values changes.
 2013-04-11 10:53:23 -07:00
Jaikumar Ganesh
6d0c1d78f1 Sensor values changes. 
1. Remove Sensor Event Pool.
2. Allocate fixed array values for each Sensor added.
   - Needed for backward compatibility.
3. Use SDK checks for backward compatibility for
   rotation vector.

b/8165631

Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
 2013-04-11 10:25:35 -07:00
Amith Yamasani
e2b8599a73 am b6812eab: am f900647a: Merge "Don\'t sync from adapters that haven\'t opted in to restricted accounts" into jb-mr2-dev 
* commit 'b6812eabd45790bcc745feab9456392d9d868664':
  Don't sync from adapters that haven't opted in to restricted accounts
 2013-04-10 19:28:18 -07:00
Amith Yamasani
b6812eabd4 am f900647a: Merge "Don\'t sync from adapters that haven\'t opted in to restricted accounts" into jb-mr2-dev 
* commit 'f900647aa823165676d2fe9bcfcfc078d99649ab':
  Don't sync from adapters that haven't opted in to restricted accounts
 2013-04-10 19:25:36 -07:00
Amith Yamasani
f900647aa8 Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev 2013-04-11 02:21:37 +00:00
Amith Yamasani
0086153dbf am 36f73e25: am 9429afba: Fix a security check in getting app restrictions 
* commit '36f73e2539c08a51a165df000b9bd0a299458877':
  Fix a security check in getting app restrictions
 2013-04-10 18:50:41 -07:00
Amith Yamasani
36f73e2539 am 9429afba: Fix a security check in getting app restrictions 
* commit '9429afba06d96973ea4bf76abba945dd92a1debb':
  Fix a security check in getting app restrictions
 2013-04-10 18:47:01 -07:00
Amith Yamasani
9429afba06 Fix a security check in getting app restrictions 
Change-Id: I02fbab8765d3f8646d0fe62ee867566d1d14707d
 2013-04-10 18:40:51 -07:00
Amith Yamasani
18a2145972 am 399a2977: am b3a98725: Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 
* commit '399a2977a5067e4ea562ad4d74aaa0f1bffe4c53':
  Show an error dialog when account type is requested on a limited user
 2013-04-10 17:36:26 -07:00
Amith Yamasani
399a2977a5 am b3a98725: Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 
* commit 'b3a9872549137f6c3983609e48e5b2d4fc94a3d4':
  Show an error dialog when account type is requested on a limited user
 2013-04-10 17:33:35 -07:00
Amith Yamasani
b3a9872549 Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 2013-04-11 00:27:49 +00:00
Christopher Tate
e775cee176 am 04f5c8cb: am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '04f5c8cb95f1f4f09bc0feacab36088066e58afb':
  Implicitly enable system apps when updates installed
 2013-04-10 17:08:42 -07:00
Amith Yamasani
9422bdca31 Don't sync from adapters that haven't opted in to restricted accounts 
SyncManager should not allow syncing of data from apps that haven't opted
in to viewing restricted accounts in limited users.

Override getIsSyncable() to check if the sync adapter has the manifest
entry to enable restricted accounts of that account type. Return the default
isSyncable state if the adapter has opted in, otherwise return 0 for false.

Bug: 8566533
Change-Id: I3777f1e4fdb8debe1724ab083272e2d9bd2e63f2
 2013-04-10 17:06:02 -07:00
Christopher Tate
04f5c8cb95 am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '790518a1a2f06030d19fdd896bd0f80dd03d94fc':
  Implicitly enable system apps when updates installed
 2013-04-10 17:04:46 -07:00
Craig Mautner
7a078314b4 am 98874efb: am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev 
* commit '98874efb994faca3bf253e9547cbb6227d44eb38':
  Debug logging improvement.
 2013-04-10 17:00:47 -07:00
Christopher Tate
790518a1a2 Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 2013-04-10 23:58:37 +00:00
Craig Mautner
98874efb99 am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev 
* commit 'cc979c9eae387d80e4c4129d18991d708dde44a6':
  Debug logging improvement.
 2013-04-10 16:57:50 -07:00
Craig Mautner
cc979c9eae Merge "Debug logging improvement." into jb-mr2-dev 2013-04-10 23:54:29 +00:00
Santos Cordon
d8ff71bdaf am 0a5eb3ec: am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 
* commit '0a5eb3eca776c414a2d170c8e697edad19f9e957':
  Obfuscate any phone numbers that pass through the event log.
 2013-04-10 16:00:40 -07:00
Santos Cordon
0a5eb3eca7 am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 
* commit 'acd840d5c31bee48cc13a03f5e0c5e3b69ff23db':
  Obfuscate any phone numbers that pass through the event log.
 2013-04-10 15:57:07 -07:00
Santos Cordon
acd840d5c3 Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 2013-04-10 22:53:08 +00:00
Jaikumar Ganesh
a934b7c99a am 7228e1ae: am 8ce470dd: GPS Hardware geofencing. 
* commit '7228e1aeb9a2af8fad410749e2adc61266b2649a':
  GPS Hardware geofencing.
 2013-04-10 15:38:24 -07:00