Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Mathieu Chartier
aa7ac9902a am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev 
* commit '6a5930128cbd3fa5dace9262ee6cefa7db53d378':
  Change EmptyArray System.identityHashCode to Object.hashCode.
 2014-09-10 21:05:29 +00:00
Raph Levien
968882e760 am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev 
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
  Remove auto spaceifying behavior on paste
 2014-09-10 21:05:25 +00:00
Mathieu Chartier
1b848d4894 Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev 2014-09-10 21:02:26 +00:00
Raph Levien
20dbc370e3 Merge "Remove auto spaceifying behavior on paste" into lmp-dev 2014-09-10 20:55:51 +00:00
Jon Miranda
7296d609f9 am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 
* commit 'a8ced9220ac8f946d5bc5d1584981434eecb562b':
  Tries to resolve reference resource names instead of its data.
 2014-09-10 20:53:25 +00:00
Jon Miranda
90981b1311 am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
  Tries to resolve reference resource names instead of its data.
 2014-09-10 20:43:05 +00:00
Jon Miranda
83e3ec9d4e Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 2014-09-10 20:34:08 +00:00
Eino-Ville Talvala
7c715ae007 am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev 
* commit '6b63cd118f2c3a82453c30618339092fa5d30323':
  Camera2: Allow captures right after abort
 2014-09-10 20:04:08 +00:00
Mathieu Chartier
b4e5061fd6 Change EmptyArray System.identityHashCode to Object.hashCode. 
Equivalent behavior, improves performance since
Object.hashCode has a fast path in the java side that does not
require JNI.

According to traceview sampling profiler:
Calendar had 6.8% time in System.identityHashCode during launch.
0.4% time in System.identityHashCode after the change.

Bug: 16828525

Change-Id: I1ed1d1283a990f990b0d4352cc1f4822b1dadf7b
 2014-09-10 12:57:29 -07:00
Eino-Ville Talvala
b8dbb01409 am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev 
* commit '90229edc689b3faebe215ce4841d1bf39d848bb5':
  Camera2: Allow captures right after abort
 2014-09-10 19:52:53 +00:00
Eino-Ville Talvala
657d30e7f4 Merge "Camera2: Allow captures right after abort" into lmp-dev 2014-09-10 19:48:21 +00:00
Robert Greenwalt
9fd4d3ce5b am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev 
* commit '5ad894d6a1e24949590ca261f303db190043ca70':
  Don't accept score below 0.
 2014-09-10 19:47:50 +00:00
Robert Greenwalt
e2d31a26f0 am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev 
* commit 'eb843b1461bba376be9dd9448bff1d8b06e25e59':
  Don't accept score below 0.
 2014-09-10 19:37:18 +00:00
Robert Greenwalt
8c9e975c44 Merge "Don't accept score below 0." into lmp-dev 2014-09-10 19:30:22 +00:00
Paul Jensen
c91b5348a5 Flush HTTP socket pools and DNS cache when binding process to a Network. 
Future HTTP requests could use an old socket that's bound to a different Network
causing unexpected results.  DNS results could also not be appropriate.

bug:17283566
bug:17432215
Change-Id: I88b40b723c7b442000cafe8ce8b9d989d8995991
 2014-09-10 18:26:25 +00:00
Jeff Davidson
a9a1449dad am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit '426a54290911d4ccbec5e139f42d1b472ea42138':
  Update unclear Fragment Javadoc.
 2014-09-10 18:04:28 +00:00
Raph Levien
5a689ce78e Remove auto spaceifying behavior on paste 
The paste action contained some logic to automatically insert or remove
spaces, basically to emulate the semantics of the text being a sequence
of space-separated words. This was never universally loved, and gives
particularly unexpected behavior with a hardware keyboard.

This patch simply removes the logic to automatically adjust spaces on
paste, so what gets pasted is simply the literal buffer contents.

Bug: 16900326
Bug: 3304489
Change-Id: I5cdf9c43d98a17aa708883b47245aa7929a124d2
 2014-09-10 11:03:18 -07:00
Jeff Davidson
65dfe5317a am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit 'cfd0e5c15a752fec962bee3b82b10cf95bb90315':
  Update unclear Fragment Javadoc.
 2014-09-10 17:53:11 +00:00
Jeff Davidson
6cb95276c3 Merge "Update unclear Fragment Javadoc." into lmp-dev 2014-09-10 17:46:21 +00:00
Robert Greenwalt
35f7a94c84 Don't accept score below 0. 
Network Factories are allowed to go below, but networks need to be
constrained.  Allowing the network to go below 0 meant that -1 could
sometimes leak through and foul the logic.

The core of 17361330 will be fixed when we stop sending scores for
listens to NetworkFactories, but it exposed this issue too.  Summary:

1 - add a network listener.  This isn't  a request so it's not sent
to networks.
2 - alter your score (ethernet sets score to -1 when the link goes
down) (16:07:39.782)
3 - a bug in ConnectivityService causes score changes to get sent for
all network requests and network listeners causing NetworkFactories
to no see 2 entities.  This bug will be fixed by a pending change
(https://googleplex-android-review.googlesource.com/#/c/540840/).
This causes the ethernet NetworkFactory to see two entities, both
served by networks of score -1.  (16:07:39.989)
4 - disconnect Ethernet - this only sends 0 scores for known
requests, not network listeners.  Had it been sent for both entities
they both would have evaluated that the networkfactory score (-1)
was lower than the request score (0) and both released their
refcount. (16:08:03.147)
5 - this means the listener is tracked by the EthernetNetworkFactory
with a score of -1 while the factory itself has a score of -1 so the
network release isn't called.

bug:17361330
Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb
 2014-09-10 10:39:37 -07:00
Ruben Brunk
385c4d7a02 am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '7ac225974bc65256888c9825d1effc87e121145f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-10 17:32:17 +00:00
Craig Mautner
6e2f395a86 Wait for animation complete before completing boot 
Defer the boot process in ActivityManagerService,
WindowManagerService and PowerManagerService until the boot
animation has completed.

Fixes bug 16309312.

Change-Id: Ic5e0d627ca4ded3e211c5d2afece89da40d34642
 2014-09-10 10:29:39 -07:00
Ruben Brunk
b0e0fd61f7 am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '17fcb2556b1c04a42398738dcc1ad491b3597aa7':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-10 17:20:58 +00:00
Esteban Talavera
cb7b978794 am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '52437ed732e9346752df7e348c7e5b0fdbd9b2ce':
  Update string value for provisioning action and extra
 2014-09-10 17:18:33 +00:00
Alexandra Gherghina
03e1e83697 Bugfix: use the correct user for ContentResolver calls 
Bug: 16860604
Change-Id: I2de228442b7bd824a115f56a24d682d346737976
 2014-09-10 18:13:12 +01:00
Ruben Brunk
a3256cd3e7 Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 2014-09-10 17:11:21 +00:00
Esteban Talavera
964a03bcaa am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
 2014-09-10 17:06:45 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Christoph Studer
ca1db7162a Notification: Reset chronometer visibility 
Bug: 17175860
Change-Id: Idd5ce5d22f30c01507d5207feaccdf1ac8a1a291
 2014-09-10 18:03:21 +02:00
Jason Monk
4534e26cc1 am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '6a74773572fdfe4001b7b3b47bc1ceafa426eb3a':
  Move zen mode constants and code to framework
 2014-09-10 15:20:57 +00:00
Jason Monk
e66afcdb46 am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '473d27fa34875083dfea48e933c2e9300979c64a':
  Move zen mode constants and code to framework
 2014-09-10 15:10:24 +00:00
John Spurlock
2cfe2229c5 am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '736196b23801319a4e477ad921cdd7f41eb66c2e':
  Zen: make Condition available over @SystemApi
 2014-09-10 15:04:31 +00:00
Jason Monk
c8e4fa41f2 Merge "Move zen mode constants and code to framework" into lmp-dev 2014-09-10 15:00:20 +00:00
John Spurlock
ee0d27f3d0 am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '821268455ca57051983c0e5f8cc24695033be174':
  Zen: make Condition available over @SystemApi
 2014-09-10 14:54:35 +00:00
George Mount
13a0819754 am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '568b3fe99baa8e5eba1acad6a522706f16803a40':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:51:05 +00:00
George Mount
5a88f7f343 am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit '557b3f662dee5298f793ec84ddcf134d34b96365':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:51:00 +00:00
John Spurlock
3e5d59c365 Merge "Zen: make Condition available over @SystemApi" into lmp-dev 2014-09-10 14:46:20 +00:00
John Spurlock
9034f2452b Zen: make Condition available over @SystemApi 
Fix build.

Bug:16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
 2014-09-10 10:42:13 -04:00
George Mount
ac0c86b344 am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:38:19 +00:00
George Mount
87995ee2be am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:38:15 +00:00
George Mount
b7d63aedf5 Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 2014-09-10 14:30:17 +00:00
George Mount
cb0567f98c Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 2014-09-10 14:29:59 +00:00
John Spurlock
39997db633 am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '88c61af5c1833e9a94f33e8150d23e7b6b50a319':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:56:05 +00:00
John Spurlock
7456ae83e8 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:45:09 +00:00
Jason Monk
4dd81467e3 Move zen mode constants and code to framework 
This allows the strings and code to be shared with settings.

Bug: 15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
 2014-09-10 09:30:03 -04:00
John Spurlock
bf4e41747d Zen: Make condition providers available via @SystemApi. 
Bug:16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
 2014-09-10 09:13:54 -04:00
Adrian Roos
444c6581ef am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit '99006f6cd5d64fa6accd4301646b4a58ac992d62':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:41:21 +00:00
Kenny Guy
1985b7e138 am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'a6e2ae352bf74ec29ae60d3f21e900d73e7da14e':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:32:20 +00:00
Christoph Studer
64fcd76970 am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '72d1509d598e53858db4f7d16d64761e32035990':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:32:15 +00:00
Christoph Studer
b14eb90414 am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '27674421aef9e3e3dd521a042b3fa939f9c92517':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:32:09 +00:00