Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,616 Commits 3 Branches 0 Tags
4a8d08285c0218d8d4cf7bc7f63feed2b2ccdb08
Commit Graph

35040 Commits

Author SHA1 Message Date
Mike Lockwood
4a8d08285c am 21f13bcb: am 9db72a51: am 68c692df: Revert "Allow L2CAP sockets" 
* commit '21f13bcb42506101550367990d3adb4d39365392':
  Revert "Allow L2CAP sockets"
 2013-10-02 09:44:38 -07:00
Dianne Hackborn
5d93ad94a3 am 1d536848: am 239dc099: am 164371fb: Fix issue #11005453: [SUW] G+ profile creation for new user broken 
* commit '1d536848af1531dd14af52000f5ab505162bf123':
  Fix issue #11005453: [SUW] G+ profile creation for new user broken
 2013-10-02 09:44:30 -07:00
Adam Lesinski
49e43291b2 am 234c6c8a: am ff7cba54: am 42e9b631: Merge "Make room for new public flags" into klp-dev 
* commit '234c6c8aafa4abc440d5bf38aac058b96ba1434c':
  Make room for new public flags
 2013-10-02 09:44:23 -07:00
Zhijun He
5af55d7a07 am 69c30a49: am a5761bd1: am 654314ee: Merge "Camera2: return device list with the only supported device" into klp-dev 
* commit '69c30a49ccc9cd5f2b2a901edec73dbdf90b9edc':
  Camera2: return device list with the only supported device
 2013-10-02 09:44:04 -07:00
Christopher Tate
9e47641c91 am 3b4e322b: am e40b3033: am 5088fc85: Merge "Specialized prompting when \'home\' has become ambiguous" into klp-dev 
* commit '3b4e322b4787f3d203745aa993f75acc4bd75278':
  Specialized prompting when 'home' has become ambiguous
 2013-10-02 09:43:36 -07:00
Alan Viverette
67ee6fe019 am 0adaf034: am 6320305a: am f079a6d0: Merge "Set live region property on AccessibilityNodeInfo" into klp-dev 
* commit '0adaf034886d9e3dd0ed81aa192f07fcff49c1a5':
  Set live region property on AccessibilityNodeInfo
 2013-10-02 09:43:29 -07:00
Alan Viverette
87c9f89412 am e3ba7f24: am c379752a: am 3320ef95: Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev 
* commit 'e3ba7f24dacfc8ef16e2f297fe3eec3c0719bfd1':
  Add findFocus API for AccessibilityNodeProvider
 2013-10-02 09:43:25 -07:00
Jeff Sharkey
b6ab3b982b am 7f60e70e: am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:43:21 -07:00
Igor Murashkin
e9ac2ef758 am 606926ed: am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev 
* commit '606926eddf94745fcf147c1d5643dc2f2071a3ca':
  camera2: Fix CameraMetadata#getKeys
 2013-10-02 09:42:52 -07:00
Mike Lockwood
21f13bcb42 am 9db72a51: am 68c692df: Revert "Allow L2CAP sockets" 
* commit '9db72a5121bacc06465b24a2711b4648a7adb289':
  Revert "Allow L2CAP sockets"
 2013-10-02 09:37:56 -07:00
Dianne Hackborn
1d536848af am 239dc099: am 164371fb: Fix issue #11005453: [SUW] G+ profile creation for new user broken 
* commit '239dc099a0d56eba3c7a537df23ef3c5046b2667':
  Fix issue #11005453: [SUW] G+ profile creation for new user broken
 2013-10-02 09:37:26 -07:00
Adam Lesinski
234c6c8aaf am ff7cba54: am 42e9b631: Merge "Make room for new public flags" into klp-dev 
* commit 'ff7cba54fc87509c94567d19c672693329868f7e':
  Make room for new public flags
 2013-10-02 09:37:13 -07:00
Zhijun He
69c30a49cc am a5761bd1: am 654314ee: Merge "Camera2: return device list with the only supported device" into klp-dev 
* commit 'a5761bd1f5166f3fd1c1bf07ce92a2ac443ee3e3':
  Camera2: return device list with the only supported device
 2013-10-02 09:36:37 -07:00
Christopher Tate
3b4e322b47 am e40b3033: am 5088fc85: Merge "Specialized prompting when \'home\' has become ambiguous" into klp-dev 
* commit 'e40b3033422c326340957989eafd1659565fb132':
  Specialized prompting when 'home' has become ambiguous
 2013-10-02 09:35:56 -07:00
Alan Viverette
0adaf03488 am 6320305a: am f079a6d0: Merge "Set live region property on AccessibilityNodeInfo" into klp-dev 
* commit '6320305a609d0c4a3b64088fe826c5cebadec985':
  Set live region property on AccessibilityNodeInfo
 2013-10-02 09:35:29 -07:00
Alan Viverette
e3ba7f24da am c379752a: am 3320ef95: Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev 
* commit 'c379752a32c7d77fe144e1a6e441ef871001d080':
  Add findFocus API for AccessibilityNodeProvider
 2013-10-02 09:35:25 -07:00
Jeff Sharkey
7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:35:14 -07:00
Igor Murashkin
606926eddf am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev 
* commit '1b1cb30d8e7aefb5466ca20e593f8d8062d36b81':
  camera2: Fix CameraMetadata#getKeys
 2013-10-02 09:34:22 -07:00
Mike Lockwood
68c692df5f Revert "Allow L2CAP sockets" 
This reverts commit 34b0f92613.
 2013-10-02 07:56:46 -07:00
Svetoslav
2caf51b5bf am 8fd521c7: am 95b1bbfe: Merge "Fix the build" into klp-dev 
* commit '8fd521c7447a6f95006adb56cfa60ff49e1befab':
  Fix the build
 2013-10-01 23:11:00 -07:00
Jeff Brown
d09d5f9e4c am 10478213: am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev 
* commit '10478213759a486524000c4164e4176437afa2d7':
  Reset insets when inset computer is removed.
 2013-10-01 23:10:56 -07:00
Svetoslav
8fd521c744 am 95b1bbfe: Merge "Fix the build" into klp-dev 
* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
  Fix the build
 2013-10-01 22:22:00 -07:00
Jeff Brown
1047821375 am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev 
* commit '5e65adaf4131bb08862fd5eae249a1f713b8ed51':
  Reset insets when inset computer is removed.
 2013-10-01 22:21:55 -07:00
Dianne Hackborn
164371fb75 Fix issue #11005453: [SUW] G+ profile creation for new user broken 
The main problem here was a mistake when turning a single process
structure to a multi-package-process structure with a common
process.  When we cloned the original process state, if there were
any services already created for the process for that package, they
would be left with their process pointer still referencing the
original now common process instead of the package-specific process,
allowing the active counts to get bad.  Now we switch any of those
processes over to the new package-specific process.

There was also another smaller issue with how ServiceRecord is
associated with a ServiceState -- we could be waiting for an
old ServiceRecord to be destroyed while at the same time creating
a new ServiceRecord for that same service class.  These would share
the same ServiceState, so when the old record finally finished
destroying itself it would trample over whatever the new service
is doing.

This is fixed by changing the model to instead of using an "active"
reference count, we have an object identifying the current owner
of the ServiceState.  Then when the old ServiceRecord is cleaning
up, we know if it is still the owner at that point.

Also some other small things along the way -- new Log.wtfStack()
method that is convenient, new suite of Slog.wtf methods, fixed
some services to use Slog.wtf when catching exceptions being
returned to the caller so that we actually know about them.

Change-Id: I75674ce38050b6423fd3c6f43d1be172b470741f
 2013-10-01 20:51:12 -07:00
Adam Lesinski
42e9b63100 Merge "Make room for new public flags" into klp-dev 2013-10-02 01:55:09 +00:00
Alan Viverette
69fdba4c38 am ed2cfdbf: am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev 
* commit 'ed2cfdbf42203463cffbbc7184d93af6187c60fc':
  Rebind transient state views when available
 2013-10-01 18:50:27 -07:00
Robert Greenwalt
d29724c640 am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev 
* commit '2b6b3d9c495d3c8332aad6515a1db06e8fde3848':
  Use a build-specific wifi country code
 2013-10-01 18:50:20 -07:00
Matthew Xie
3d2a664a42 am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev 
* commit '9eb9ebb2fbbe1135919cf685d84eba18cfecdf01':
  Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
 2013-10-01 18:50:10 -07:00
Adam Lesinski
6a591f5859 Make room for new public flags 
Moved two hidden flags to private

bug:11033280
Change-Id: Icca867b073aff643eefdaf84df68de86bb6b05ac
 2013-10-01 18:48:20 -07:00
Romain Guy
c3e21ba1ce am bb1d4d38: am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit 'bb1d4d3896b781905bbf3ccbd5d5617da61cc3eb':
  Fragement, or Fragment: that is the question
 2013-10-01 18:46:05 -07:00
Dianne Hackborn
81f87faede am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev 
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
 2013-10-01 18:45:11 -07:00
Svetoslav Ganov
a35df7dacc am 0ed01ab5: Merge "Printers in the list of printers change position." into klp-dev 
* commit '0ed01ab57f1277a3889da10daa87733c1af6e0d0':
  Printers in the list of printers change position.
 2013-10-01 18:44:58 -07:00
Svetoslav
a4e395057f am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev 
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
  Ignore historical printer records for installed services
 2013-10-01 18:44:25 -07:00
Jim Miller
d273cae2c4 resolved conflicts for merge of fb2e3c8d to master 
Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576
 2013-10-01 15:42:45 -07:00
Zhijun He
654314eedf Merge "Camera2: return device list with the only supported device" into klp-dev 2013-10-01 22:40:11 +00:00
Zhijun He
18fe0ae08d Camera2: return device list with the only supported device 
Bug: 10360518
Change-Id: I823f0b6965728ddefc9b70f3df0f50259919cce5
 2013-10-01 14:26:40 -07:00
Christopher Tate
5088fc858c Merge "Specialized prompting when 'home' has become ambiguous" into klp-dev 2013-10-01 20:39:05 +00:00
Christopher Tate
b72b363c97 Specialized prompting when 'home' has become ambiguous 
Bug 9958444

Change-Id: I050ae425e570cfc8ffd473587fb2a6127c36eeec
 2013-10-01 13:32:13 -07:00
Alan Viverette
f079a6d07f Merge "Set live region property on AccessibilityNodeInfo" into klp-dev 2013-10-01 18:33:12 +00:00
Alan Viverette
18c631931b Merge "Add accessibility display adjustments" 2013-10-01 18:33:01 +00:00
Alan Viverette
3320ef95de Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev 2013-10-01 18:32:48 +00:00
Fabrice Di Meglio
c993e7447d Merge "Update TimePicker widget and its related dialog" 2013-10-01 18:10:21 +00:00
Jeff Sharkey
7aa7601c09 Detect wedged ContentProviders, treat as ANR. 
All ContentProvider calls are currently blocking, making it hard for
an app to recover when a remote provider is wedged.  This change adds
hidden support to ContentProviderClient to timeout remote calls,
treating them as ANRs.  This behavior is disabled by default.

Update DocumentsUI to use a 20 second timeout whenever interacting
with a storage provider.

Bug: 10993301, 10819461, 10852518
Change-Id: I10fa3c425c6a7225fff9cb7a0a07659028230cd3
 2013-10-01 09:50:41 -07:00
Alan Viverette
ed2cfdbf42 am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev 
* commit '6f07cc8424caccda695918f83e1b57f7a67d9f0c':
  Rebind transient state views when available
 2013-10-01 05:26:40 -07:00
Robert Greenwalt
2b6b3d9c49 am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev 
* commit 'bad5d694c7d7ae27ca966d6da059f81c5d964748':
  Use a build-specific wifi country code
 2013-10-01 05:26:34 -07:00
Svetoslav Ganov
ce5cb02eca am b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev 
* commit 'b415525a16074b6dc8e295655648b7c7c1074bbb':
  Print job files and print job records not always cleaned up.
 2013-09-30 19:46:15 -07:00
Igor Murashkin
1b1cb30d8e Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev 2013-10-01 02:10:17 +00:00
Igor Murashkin
03fdb14ba8 camera2: Fix CameraMetadata#getKeys 
Bug: 11007040
Change-Id: I08755bf45ae60ff00736af3672a9f6091f460496
 2013-09-30 17:38:54 -07:00
Svetoslav
95b1bbfe6c Merge "Fix the build" into klp-dev 2013-10-01 00:36:56 +00:00
Svetoslav
f43e851f96 Fix the build 
Change-Id: I2d701199808b1a0d482b9593c8b0730a408c3e8e
 2013-09-30 17:33:05 -07:00